forked from bartvdbraak/blender
comment assert and ensure meshes are always calculated with CD_MASK_BAREMESH, scene->customdata_mask should be corrected in background mode but for now this is ok.
This commit is contained in:
parent
1704a5546d
commit
221187bcbd
@ -2549,6 +2549,7 @@ void object_handle_update(Scene *scene, Object *ob)
|
|||||||
switch(ob->type) {
|
switch(ob->type) {
|
||||||
case OB_MESH:
|
case OB_MESH:
|
||||||
{
|
{
|
||||||
|
#if 0 // XXX, comment for 2.56a release, background wont set 'scene->customdata_mask'
|
||||||
EditMesh *em = (ob == scene->obedit)? BKE_mesh_get_editmesh(ob->data): NULL;
|
EditMesh *em = (ob == scene->obedit)? BKE_mesh_get_editmesh(ob->data): NULL;
|
||||||
BKE_assert((scene->customdata_mask & CD_MASK_BAREMESH) == CD_MASK_BAREMESH);
|
BKE_assert((scene->customdata_mask & CD_MASK_BAREMESH) == CD_MASK_BAREMESH);
|
||||||
if(em) {
|
if(em) {
|
||||||
@ -2556,6 +2557,16 @@ void object_handle_update(Scene *scene, Object *ob)
|
|||||||
BKE_mesh_end_editmesh(ob->data, em);
|
BKE_mesh_end_editmesh(ob->data, em);
|
||||||
} else
|
} else
|
||||||
makeDerivedMesh(scene, ob, NULL, scene->customdata_mask);
|
makeDerivedMesh(scene, ob, NULL, scene->customdata_mask);
|
||||||
|
|
||||||
|
#else /* ensure CD_MASK_BAREMESH for now */
|
||||||
|
EditMesh *em = (ob == scene->obedit)? BKE_mesh_get_editmesh(ob->data): NULL;
|
||||||
|
if(em) {
|
||||||
|
makeDerivedMesh(scene, ob, em, scene->customdata_mask | CD_MASK_BAREMESH); /* was CD_MASK_BAREMESH */
|
||||||
|
BKE_mesh_end_editmesh(ob->data, em);
|
||||||
|
} else
|
||||||
|
makeDerivedMesh(scene, ob, NULL, scene->customdata_mask | CD_MASK_BAREMESH);
|
||||||
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user