diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-10 21:12:58 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-10 21:12:58 +0300 |
| commit | 47c47c7e78e132bf668ca9b6a63eefbda3f36ea8 (patch) | |
| tree | e3f997ca7f7167a3084dfa50220858312a089d94 /source/blender | |
| parent | 8df92988cf3c5ff75f973764c3fa88d71b71169e (diff) | |
Fix T48822: Crash when I try to use "Join" (Ctrl Key + J) with two meshes.
Own stupid typo in recent refactor work...
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index fc7854af713..bd476ccc9c7 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -672,7 +672,7 @@ void test_all_objects_materials(Main *bmain, ID *id) } BKE_main_lock(bmain); - for (bmain = bmain->object.first; ob; ob = ob->id.next) { + for (ob = bmain->object.first; ob; ob = ob->id.next) { if (ob->data == id) { BKE_material_resize_object(ob, *totcol, false); } |