[Bf-blender-cvs] [47c47c7] master: Fix T48822: Crash when I try to use "Join" (Ctrl Key + J) with two meshes.
Bastien Montagne
noreply at git.blender.org
Sun Jul 10 20:13:39 CEST 2016
Commit: 47c47c7e78e132bf668ca9b6a63eefbda3f36ea8
Author: Bastien Montagne
Date: Sun Jul 10 20:12:58 2016 +0200
Branches: master
https://developer.blender.org/rB47c47c7e78e132bf668ca9b6a63eefbda3f36ea8
Fix T48822: Crash when I try to use "Join" (Ctrl Key + J) with two meshes.
Own stupid typo in recent refactor work...
===================================================================
M source/blender/blenkernel/intern/material.c
===================================================================
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index fc7854a..bd476cc 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);
}
More information about the Bf-blender-cvs
mailing list