forked from bartvdbraak/blender
Fix for bug #14410: multires + vertex colors crash rendering
or baking while in editmode.
This commit is contained in:
parent
1ca6768051
commit
d568794a98
@ -966,9 +966,9 @@ void multires_update_levels(Mesh *me, const int render)
|
||||
multires_update_colors(me, em);
|
||||
}
|
||||
|
||||
static void check_colors(Mesh *me)
|
||||
static void check_colors(Mesh *me, const int render)
|
||||
{
|
||||
CustomData *src= G.obedit ? &G.editMesh->fdata : &me->fdata;
|
||||
CustomData *src= (!render && G.obedit)? &G.editMesh->fdata : &me->fdata;
|
||||
const char col= CustomData_has_layer(src, CD_MCOL);
|
||||
|
||||
/* Check if vertex colors have been deleted or added */
|
||||
@ -1110,7 +1110,7 @@ void multires_add_level(Object *ob, Mesh *me, const char subdiv_type)
|
||||
lvl= MEM_callocN(sizeof(MultiresLevel), "multireslevel");
|
||||
if(me->pv) mesh_pmv_off(ob, me);
|
||||
|
||||
check_colors(me);
|
||||
check_colors(me, 0);
|
||||
multires_update_levels(me, 0);
|
||||
|
||||
++me->mr->level_count;
|
||||
@ -1276,7 +1276,7 @@ void multires_set_level(Object *ob, Mesh *me, const int render)
|
||||
{
|
||||
if(me->pv) mesh_pmv_off(ob, me);
|
||||
|
||||
check_colors(me);
|
||||
check_colors(me, render);
|
||||
multires_update_levels(me, render);
|
||||
|
||||
me->mr->current= me->mr->newlvl;
|
||||
|
Loading…
Reference in New Issue
Block a user