archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

- bug fix #2940, at some point assumption that mesh_get_derived_...

Browse Source 
returned NULL in editmode was invalidated which caused a crash in
   particles (was freeing subsurf cache). I can't remember but hope
   that I didn't intentionally break this assumption for some
   reason. :/
This commit is contained in:
Daniel Dunbar
2005-10-09 18:38:40 +00:00
parent 8649197925
commit 7a742d9f89
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
source/blender/blenkernel/intern/DerivedMesh.c
View File

@@ -1814,27 +1814,29 @@ static void mesh_build_data(Object *ob)
clear_mesh_caches(ob);
if( (G.f & G_WEIGHTPAINT) && ob==(G.scene->basact?G.scene->basact->object:NULL)) {
MCol *mcol = me->mcol;
TFace *tface = me->tface;
if(ob!=G.obedit) {
if( (G.f & G_WEIGHTPAINT) && ob==(G.scene->basact?G.scene->basact->object:NULL)) {
MCol *mcol = me->mcol;
TFace *tface = me->tface;
me->tface = NULL;
me->mcol = (MCol*) calc_weightpaint_colors(ob);
me->tface = NULL;
me->mcol = (MCol*) calc_weightpaint_colors(ob);
mesh_calc_modifiers(ob, NULL, &ob->derivedDeform, &ob->derivedFinal, 0, 1);
mesh_calc_modifiers(ob, NULL, &ob->derivedDeform, &ob->derivedFinal, 0, 1);
MEM_freeN(me->mcol);
me->mcol = mcol;
me->tface = tface;
} else {
mesh_calc_modifiers(ob, NULL, &ob->derivedDeform, &ob->derivedFinal, 0, 1);
MEM_freeN(me->mcol);
me->mcol = mcol;
me->tface = tface;
} else {
mesh_calc_modifiers(ob, NULL, &ob->derivedDeform, &ob->derivedFinal, 0, 1);
}
INIT_MINMAX(min, max);
ob->derivedFinal->getMinMax(ob->derivedFinal, min, max);
boundbox_set_from_min_max(mesh_get_bb(ob->data), min, max);
}
INIT_MINMAX(min, max);
ob->derivedFinal->getMinMax(ob->derivedFinal, min, max);
boundbox_set_from_min_max(mesh_get_bb(ob->data), min, max);
}
static void editmesh_build_data(void)