diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-27 01:22:35 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-27 01:22:35 +0400 |
commit | a267f9ba4e7904c6e32e062aaccc282d974643bf (patch) | |
tree | 6ec0d31ecf6359652a69c1c497265d60e6f0b0a3 /source/blender/blenkernel/intern/armature.c | |
parent | ba0ef7a592ace7d6baa5c5f1342706de4e70b2e8 (diff) |
edits ontop of Alex's patch from r41292.
pass main rather than use G.main when naming from -> to relative paths.
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
-rw-r--r-- | source/blender/blenkernel/intern/armature.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index c1675faf053..b4b5dfedad2 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -141,7 +141,7 @@ void make_local_armature(bArmature *arm) if (arm->id.lib==NULL) return; if (arm->id.us==1) { - id_clear_lib_data(&bmain->armature, (ID *)arm); + id_clear_lib_data(bmain, (ID *)arm); return; } @@ -153,7 +153,7 @@ void make_local_armature(bArmature *arm) } if(local && lib==0) { - id_clear_lib_data(&bmain->armature, (ID *)arm); + id_clear_lib_data(bmain, (ID *)arm); } else if(local && lib) { bArmature *armn= copy_armature(arm); |