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/action.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/action.c')
-rw-r--r-- | source/blender/blenkernel/intern/action.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 5b42948072f..058227e7cc3 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -95,6 +95,7 @@ bAction *add_empty_action(const char name[]) void make_local_action(bAction *act) { // Object *ob; + Main *bmain= G.main; bAction *actn; int local=0, lib=0; @@ -102,7 +103,7 @@ void make_local_action(bAction *act) if (act->id.us==1) { act->id.lib= NULL; act->id.flag= LIB_LOCAL; - new_id(NULL, (ID *)act, NULL); + new_id(&bmain->action, (ID *)act, NULL); return; } @@ -121,7 +122,7 @@ void make_local_action(bAction *act) act->id.lib= NULL; act->id.flag= LIB_LOCAL; //make_local_action_channels(act); - new_id(NULL, (ID *)act, NULL); + new_id(&bmain->action, (ID *)act, NULL); } else if(local && lib) { actn= copy_action(act); |