diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-02-11 06:16:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-02-11 06:16:22 +0300 |
| commit | 4f9f42d30eb3349a6b15e16a5b25e31ca293d5c8 (patch) | |
| tree | 80ab2f637944cced714ad22961a9aba9b1f67f63 /source/blender/src/editobject.c | |
| parent | 28c733406dd72db992cada4fe1c5191124e9c68b (diff) | |
World settings ambient occlusion could be set even when its a library
making local objects with a dupligroup didnt disable the indirect flag, also made the tool respect visible and restricted flags.
Diffstat (limited to 'source/blender/src/editobject.c')
| -rw-r--r-- | source/blender/src/editobject.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/source/blender/src/editobject.c b/source/blender/src/editobject.c index 2c49781274d..2040d8aedf6 100644 --- a/source/blender/src/editobject.c +++ b/source/blender/src/editobject.c @@ -4634,8 +4634,8 @@ void make_local(int mode) base= FIRSTBASE; while(base) { - ob= base->object; - if( (base->flag & SELECT)) { + if( TESTBASE(base) ) { + ob= base->object; if(ob->id.lib) { make_local_object(ob); } @@ -4646,8 +4646,8 @@ void make_local(int mode) /* maybe object pointers */ base= FIRSTBASE; while(base) { - ob= base->object; - if( (base->flag & SELECT)) { + if( TESTBASE(base) ) { + ob= base->object; if(ob->id.lib==NULL) { ID_NEW(ob->parent); ID_NEW(ob->track); @@ -4658,9 +4658,8 @@ void make_local(int mode) base= FIRSTBASE; while(base) { - ob= base->object; - if( (base->flag & SELECT) ) { - + if( TESTBASE(base) ) { + ob= base->object; id= ob->data; if(id && mode>1) { @@ -4720,9 +4719,8 @@ void make_local(int mode) if(mode>1) { base= FIRSTBASE; while(base) { - ob= base->object; - if(base->flag & SELECT ) { - + if( TESTBASE(base) ) { + ob= base->object; if(ob->type==OB_LAMP) { la= ob->data; for(b=0; b<MAX_MTEX; b++) { |