From 73986000902c34020f581a6ef7395a9259b7f6c2 Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Wed, 6 Nov 2013 17:46:32 +0000 Subject: True grid snapping for nodes: This snaps nodes to the actual background grid instead of using incremental offset (which is not useful for nodes). Increment snapping has been disabled for nodes to avoid confusion, grid snap is now the default as it seems to be the most wanted and easy to use mode. Absolute grid snapping happens in a somewhat generic function 'applyGridAbsolute', which could also be used for objects and other transforms later on. It is conceptually similar to the 'project' snapping option, in that it calculates a delta vector for each element on top of the overall transform, which places each node on the grid. Node transform now uses the top-left node corner for TransformData->loc. The transform center is still the average of node centers, so that scaling and rotation works nicely. snapGrid*** functions have been renamed to snapGridIncrement*** to distinguish better between incremental and absolute grid snapping. --- release/scripts/startup/bl_ui/space_node.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release/scripts/startup/bl_ui/space_node.py') diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 1721eacd8ac..b9aa3feb607 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -105,7 +105,7 @@ class NODE_HT_header(Header): row = layout.row(align=True) row.prop(toolsettings, "use_snap", text="") row.prop(toolsettings, "snap_node_element", text="", icon_only=True) - if toolsettings.snap_node_element != 'INCREMENT': + if toolsettings.snap_node_element != 'GRID': row.prop(toolsettings, "snap_target", text="") row = layout.row(align=True) -- cgit v1.2.3 From 549ed3d37873e242f12eb6d38ba481f4ed99e115 Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Wed, 6 Nov 2013 18:56:51 +0000 Subject: Removed the "Show Cyclic Dependencies" operator for nodes. This operator is an old relic implemented for showing cyclic node connections as red links. This is not necessary any more, the operator simply called the generic node tree update function, which is happening anyway after all relevant node operators (if it doesn't that has to be considered a bug). It has been suggested to better use the C key for circle select, this remains to be discussed. --- release/scripts/startup/bl_ui/space_node.py | 1 - 1 file changed, 1 deletion(-) (limited to 'release/scripts/startup/bl_ui/space_node.py') diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index b9aa3feb607..f9e32256566 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -233,7 +233,6 @@ class NODE_MT_node(Menu): layout.separator() - layout.operator("node.show_cyclic_dependencies") layout.operator("node.read_renderlayers") layout.operator("node.read_fullsamplelayers") -- cgit v1.2.3 From 61c411068b4b6c593a3bb05b073b26e0d0227995 Mon Sep 17 00:00:00 2001 From: Lukas Toenne Date: Wed, 6 Nov 2013 19:21:42 +0000 Subject: Patch #37274: Circle select for node editor, by Henrik Aarnio (hjaarnio). Circle select was missing from node editor, and C key was assigned to now defunct "show cyclic dependencies". This patch remaps the key and adds circle select operator. Functions to check intersection between rctf/rcti and a circle were also added to rct.c for code cleanliness and consistency. --- release/scripts/startup/bl_ui/space_node.py | 1 + 1 file changed, 1 insertion(+) (limited to 'release/scripts/startup/bl_ui/space_node.py') diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index f9e32256566..8d577bb22c5 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -169,6 +169,7 @@ class NODE_MT_select(Menu): layout = self.layout layout.operator("node.select_border") + layout.operator("node.select_circle") layout.separator() layout.operator("node.select_all").action = 'TOGGLE' -- cgit v1.2.3 From 1ea47c9af9bf707d7ddb36c88425636ac35e0fc8 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 20 Nov 2013 03:38:18 +1100 Subject: Code Cleanup: style, spelling and pep8 edits --- release/scripts/startup/bl_ui/space_node.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release/scripts/startup/bl_ui/space_node.py') diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 8d577bb22c5..46234b638eb 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -364,7 +364,7 @@ class NODE_PT_backdrop(Panel): col.prop(snode, "backdrop_x", text="X") col.prop(snode, "backdrop_y", text="Y") col.operator("node.backimage_move", text="Move") - + layout.operator("node.backimage_fit", text="Fit") -- cgit v1.2.3