Blender Git Loki
Git Commits -> Revision 600fb28
Revision 600fb28 by Hans Goudey (master) December 2, 2020, 14:38 (GMT) |
Geometry Nodes: active modifier + geometry nodes editor This commit adds functions to set and get the object's active modifier, which is stored as a flag in the ModifierData struct, similar to constraints. This will be used to set the context in the node editor. There are no visible changes in this commit. Similar to how the node editor context works for materials, this commit makes the node group displayed in the node editor depend on the active object and its active modifier. To keep the node group from changing, just pin the node group in the header. * Shortcuts performed while there is an active modifier will affect only that modifier (the exception is the A to expand the modifiers). * Clicking anywhere on the empty space in a modifier's panel will make it active. These changes require some refactoring of object modifier code. First is splitting up the modifier property invoke callback, which now needs to be able to get the active modifier separately from the hovered modifier for the different operators. Second is a change to removing modifiers, where there is now a separate function to remove a modifier from an object's list, in order to handle changing the active. Finally, the panel handler needs a small tweak so that this "click in panel" event can be handled afterwards. |
Commit Details:
Full Hash: 600fb28b629598af2537c542e7f3f76ba0e94389
Parent Commit: fc4a853
Committed By: Jacques Lucke
Lines Changed: +474, -134
24 Modified Paths:
/release/scripts/presets/keyconfig/keymap_data/blender_default.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_modifier.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_object.h (+4, -0) (Diff)
/source/blender/blenkernel/BKE_screen.h (+5, -0) (Diff)
/source/blender/blenkernel/intern/fluid.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/modifier.c (+20, -0) (Diff)
/source/blender/blenkernel/intern/object.c (+40, -0) (Diff)
/source/blender/blenkernel/intern/particle.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_panel.c (+60, -9) (Diff)
/source/blender/editors/interface/interface_widgets.c (+37, -24) (Diff)
/source/blender/editors/object/object_data_transfer.c (+1, -1) (Diff)
/source/blender/editors/object/object_hook.c (+1, -1) (Diff)
/source/blender/editors/object/object_intern.h (+7, -4) (Diff)
/source/blender/editors/object/object_modifier.c (+149, -81) (Diff)
/source/blender/editors/object/object_ops.c (+1, -0) (Diff)
/source/blender/editors/object/object_relations.c (+1, -1) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+28, -10) (Diff)
/source/blender/editors/space_node/space_node.c (+8, -0) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+5, -0) (Diff)
/source/blender/makesdna/DNA_object_types.h (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+26, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+38, -0) (Diff)
/source/blender/modifiers/intern/MOD_ui_common.c (+1, -0) (Diff)
/source/blender/nodes/geometry/node_geometry_tree.cc (+35, -0) (Diff)
/source/blender/blenkernel/BKE_modifier.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_object.h (+4, -0) (Diff)
/source/blender/blenkernel/BKE_screen.h (+5, -0) (Diff)
/source/blender/blenkernel/intern/fluid.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/modifier.c (+20, -0) (Diff)
/source/blender/blenkernel/intern/object.c (+40, -0) (Diff)
/source/blender/blenkernel/intern/particle.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_panel.c (+60, -9) (Diff)
/source/blender/editors/interface/interface_widgets.c (+37, -24) (Diff)
/source/blender/editors/object/object_data_transfer.c (+1, -1) (Diff)
/source/blender/editors/object/object_hook.c (+1, -1) (Diff)
/source/blender/editors/object/object_intern.h (+7, -4) (Diff)
/source/blender/editors/object/object_modifier.c (+149, -81) (Diff)
/source/blender/editors/object/object_ops.c (+1, -0) (Diff)
/source/blender/editors/object/object_relations.c (+1, -1) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+28, -10) (Diff)
/source/blender/editors/space_node/space_node.c (+8, -0) (Diff)
/source/blender/makesdna/DNA_modifier_types.h (+5, -0) (Diff)
/source/blender/makesdna/DNA_object_types.h (+2, -0) (Diff)
/source/blender/makesrna/intern/rna_modifier.c (+26, -0) (Diff)
/source/blender/makesrna/intern/rna_object.c (+38, -0) (Diff)
/source/blender/modifiers/intern/MOD_ui_common.c (+1, -0) (Diff)
/source/blender/nodes/geometry/node_geometry_tree.cc (+35, -0) (Diff)