diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-04-26 11:17:21 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-26 11:17:21 +0400 |
commit | e4cc1c3f2c3e5a85fbf4f7f2757b09544dd556ee (patch) | |
tree | 1d134f4085ba2d90e854c47848c6fc82704667bb /source/blender/blenkernel/intern/lattice.c | |
parent | 461a7c5c8185d0504c63ddc8de0b2c765e72be4b (diff) |
fix [#27178] Material links lost when making mesh data local
- making local object data - Curve/Mesh/MBall lost references to linked materials.
- joining a linked mesh object into a local one lost the link.
As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail.
- making local metaball didn't ensure unique ID name.
- make_local_armature() was missing check for object users - main body of code would never run.
- local particles didn't set the dupli-group or textures to extern.
checked all local functions for consistency/correctness.
Diffstat (limited to 'source/blender/blenkernel/intern/lattice.c')
-rw-r--r-- | source/blender/blenkernel/intern/lattice.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index d308ccbf876..f0ac7040deb 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -249,8 +249,8 @@ void free_lattice(Lattice *lt) void make_local_lattice(Lattice *lt) { + Main *bmain= G.main; Object *ob; - Lattice *ltn; int local=0, lib=0; /* - only lib users: do nothing @@ -262,39 +262,34 @@ void make_local_lattice(Lattice *lt) if(lt->id.us==1) { lt->id.lib= NULL; lt->id.flag= LIB_LOCAL; - new_id(NULL, (ID *)lt, NULL); + new_id(&bmain->latt, (ID *)lt, NULL); return; } - ob= G.main->object.first; - while(ob) { + for(ob= bmain->object.first; ob && ELEM(0, lib, local); ob= ob->id.next) { if(ob->data==lt) { if(ob->id.lib) lib= 1; else local= 1; } - ob= ob->id.next; } if(local && lib==0) { lt->id.lib= NULL; lt->id.flag= LIB_LOCAL; - new_id(NULL, (ID *)lt, NULL); + new_id(&bmain->latt, (ID *)lt, NULL); } else if(local && lib) { - ltn= copy_lattice(lt); + Lattice *ltn= copy_lattice(lt); ltn->id.us= 0; - - ob= G.main->object.first; - while(ob) { + + for(ob= bmain->object.first; ob; ob= ob->id.next) { if(ob->data==lt) { - if(ob->id.lib==NULL) { ob->data= ltn; ltn->id.us++; lt->id.us--; } } - ob= ob->id.next; } } } |