archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

World settings ambient occlusion could be set even when its a library

Browse Source 
making local objects with a dupligroup didnt disable the indirect flag, also made the tool respect visible and restricted flags.
This commit is contained in:
Campbell Barton
2008-02-11 03:16:22 +00:00
parent 28c733406d
commit 4f9f42d30e
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/src/editobject.c
View File

@@ -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++) {