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/material.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/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 12d92d57e86..4fd2c3ff2fc 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -297,7 +297,7 @@ void make_local_material(Material *ma) /* One local user; set flag and return. */ if(ma->id.us==1) { - id_clear_lib_data(&bmain->mat, (ID *)ma); + id_clear_lib_data(bmain, (ID *)ma); extern_local_material(ma); return; } @@ -359,7 +359,7 @@ void make_local_material(Material *ma) /* Only local users. */ if(local && lib==0) { - id_clear_lib_data(&bmain->mat, (ID *)ma); + id_clear_lib_data(bmain, (ID *)ma); extern_local_material(ma); } /* Both user and local, so copy. */ |