Merge branch 'master' of git@git.blender.org:blender.git into blender2.8

2017-07-14 11:24:43 -03:00 · 2017-07-14 11:24:43 -03:00 · 51442b64d6
parent 8f14b96f7b 5fb5b74890
commit 51442b64d6
1 changed files with 1 additions and 1 deletions
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@ -170,7 +170,7 @@ struct SnapObjectContext {
 				}\
 				free_object_duplilist(lb);\
 			}\
-			use_obedit = obedit && ob->data == obedit->data;\
+			use_obedit = obedit && obj->data == obedit->data;\
 			ob = use_obedit ? obedit : obj;\
 			obmat = ob->obmat;\
 			CODE\