blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

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

This commit is contained in:
Germano Cavalcante 2017-07-14 10:42:59 -03:00
parent 92f3b4ac64 c6ddef7359
commit 8f14b96f7b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/transform/transform_snap_object.c
View File

@ -159,7 +159,7 @@ struct SnapObjectContext {
(snap_select == SNAP_NOT_ACTIVE && base == base_act)))\
{\
Object *obj = base->object;\
if (ob->transflag & OB_DUPLI) {\
if (obj->transflag & OB_DUPLI) {\
DupliObject *dupli_ob;\
ListBase *lb = object_duplilist(sctx->bmain->eval_ctx, sctx->scene, obj);\
for (dupli_ob = lb->first; dupli_ob; dupli_ob = dupli_ob->next) {\