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:
authorCampbell Barton <ideasman42@gmail.com>2013-08-19 08:23:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-08-19 08:23:54 +0400
commitf008a4c55142225c9ab7a2fe363c06080128fe51 (patch)
treee0aa3e067e7cd628508a1be2ea114a599f496c6a
parent43e9913ba3088c873839d7535ebfb2c7b765a198 (diff)
edit to object center snapping, exit early if unsupported.
-rw-r--r--source/blender/editors/transform/transform_snap.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 57078bc7931..86bdcbdb394 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -1527,6 +1527,14 @@ static bool snapEmpty(short snap_mode, ARegion *ar, Object *ob, float obmat[4][4
float ray_start_local[3], ray_normal_local[3];
bool retval = false;
+ if (ob->transflag & OB_DUPLI) {
+ return retval;
+ }
+ /* for now only vertex supported */
+ if (snap_mode != SCE_SNAP_MODE_VERTEX) {
+ return retval;
+ }
+
invert_m4_m4(imat, obmat);
copy_v3_v3(ray_start_local, ray_start);
@@ -1535,10 +1543,6 @@ static bool snapEmpty(short snap_mode, ARegion *ar, Object *ob, float obmat[4][4
mul_m4_v3(imat, ray_start_local);
mul_mat3_m4_v3(imat, ray_normal_local);
- if (ob->transflag & OB_DUPLI) {
- return retval;
- }
-
switch (snap_mode) {
case SCE_SNAP_MODE_VERTEX:
{