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/texture.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/texture.c')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index b7fc2835f63..bf4cd84f571 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -814,7 +814,8 @@ Tex *localize_texture(Tex *tex) /* ------------------------------------------------------------------------- */ -static void extern_local_texture(Tex *tex) { +static void extern_local_texture(Tex *tex) +{ id_lib_extern((ID *)tex->ima); } @@ -837,7 +838,7 @@ void make_local_texture(Tex *tex) if(tex->id.lib==NULL) return; if(tex->id.us==1) { - id_clear_lib_data(&bmain->tex, (ID *)tex); + id_clear_lib_data(bmain, (ID *)tex); extern_local_texture(tex); return; } @@ -892,7 +893,7 @@ void make_local_texture(Tex *tex) } if(local && lib==0) { - id_clear_lib_data(&bmain->tex, (ID *)tex); + id_clear_lib_data(bmain, (ID *)tex); extern_local_texture(tex); } else if(local && lib) { |