[Bf-blender-cvs] [b3d12f6] blender-v2.76-release: Fix node auto-offset to left broken

Julian Eisel noreply at git.blender.org
Wed Sep 30 17:10:33 CEST 2015


Commit: b3d12f65c04f8012df3b7969494d5fbf6af7df7d
Author: Julian Eisel
Date:   Fri Sep 25 17:08:33 2015 +0200
Branches: blender-v2.76-release
https://developer.blender.org/rBb3d12f65c04f8012df3b7969494d5fbf6af7df7d

Fix node auto-offset to left broken

Own, really stupid mistake in rBc653077bf56 :| Kids, don't commit at night!

===================================================================

M	source/blender/editors/space_node/node_relationships.c

===================================================================

diff --git a/source/blender/editors/space_node/node_relationships.c b/source/blender/editors/space_node/node_relationships.c
index a9f126a..4097db2 100644
--- a/source/blender/editors/space_node/node_relationships.c
+++ b/source/blender/editors/space_node/node_relationships.c
@@ -1646,10 +1646,15 @@ static int node_insert_offset_modal(bContext *C, wmOperator *UNUSED(op), const w
 	for (node = snode->edittree->nodes.first; node; node = node->next) {
 		if (UNLIKELY(node->anim_ofsx)) {
 			const float endval = node->anim_init_locx + node->anim_ofsx;
-			if (node->locx < endval) {
+			if (IS_EQF(node->locx, endval) == false) {
 				node->locx = BLI_easing_cubic_ease_in_out(duration, node->anim_init_locx, node->anim_ofsx,
 				                                          NODE_INSOFS_ANIM_DURATION);
-				CLAMP_MAX(node->locx, endval);
+				if (node->anim_ofsx < 0) {
+					CLAMP_MIN(node->locx, endval);
+				}
+				else {
+					CLAMP_MAX(node->locx, endval);
+				}
 				redraw = true;
 			}
 		}




More information about the Bf-blender-cvs mailing list