Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2014-01-21 16:13:41 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2014-01-21 16:13:41 +0400
commit19da32abf33b5d8a579cf7c0c171a7fe3d350aa0 (patch)
tree604d327da7ae85c289807c239190586da93ef324 /source/blender/editors/transform/transform_snap.c
parent8742f65513aff23d8a5bddd81741c74ae1e372e7 (diff)
Fix T38128: snapping to node border uses node centers.
This was caused by recent change to transform locations being changed to the upper-left corner of nodes (rBa857a6f).
Diffstat (limited to 'source/blender/editors/transform/transform_snap.c')
-rw-r--r--source/blender/editors/transform/transform_snap.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 5b90cc93083..f0762e19376 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -1051,6 +1051,7 @@ static void TargetSnapOffset(TransInfo *t, TransData *td)
float width = BLI_rctf_size_x(&node->totr);
float height = BLI_rctf_size_y(&node->totr);
+#ifdef USE_NODE_CENTER
if (border & NODE_LEFT)
t->tsnap.snapTarget[0] -= 0.5f * width;
if (border & NODE_RIGHT)
@@ -1059,6 +1060,16 @@ static void TargetSnapOffset(TransInfo *t, TransData *td)
t->tsnap.snapTarget[1] -= 0.5f * height;
if (border & NODE_TOP)
t->tsnap.snapTarget[1] += 0.5f * height;
+#else
+ if (border & NODE_LEFT)
+ t->tsnap.snapTarget[0] -= 0.0f;
+ if (border & NODE_RIGHT)
+ t->tsnap.snapTarget[0] += width;
+ if (border & NODE_BOTTOM)
+ t->tsnap.snapTarget[1] -= height;
+ if (border & NODE_TOP)
+ t->tsnap.snapTarget[1] += 0.0f;
+#endif
}
}