forked from bartvdbraak/blender
== Multires ==
Fixed a crash on adding a UV layer to a multires mesh while in editmode.
This commit is contained in:
parent
fc2cf13fc6
commit
55d49ed63b
@ -48,6 +48,7 @@ void multires_draw_interface(struct uiBlock *block, unsigned short cx, unsigned
|
||||
void multires_make(void *ob, void *me);
|
||||
void multires_delete(void *ob, void *me);
|
||||
void multires_level_to_editmesh(struct Object *ob, struct Mesh *me, const int render);
|
||||
void multires_finish_mesh_update(struct Object *ob);
|
||||
void multires_subdivide(void *ob, void *me);
|
||||
void multires_del_lower(void *ob, void *me);
|
||||
void multires_del_higher(void *ob, void *me);
|
||||
|
@ -739,6 +739,7 @@ static void delete_customdata_layer(void *data1, void *data2)
|
||||
if(me && me->mr) {
|
||||
multires_delete_layer(me, &me->mr->fdata, type, layer - &data->layers[index]);
|
||||
multires_level_to_editmesh(OBACT, me, 0);
|
||||
multires_finish_mesh_update(OBACT);
|
||||
}
|
||||
else if(G.obedit) {
|
||||
EM_free_data_layer(data, type);
|
||||
@ -4497,6 +4498,7 @@ void do_meshbuts(unsigned short event)
|
||||
if(me && me->mr) {
|
||||
multires_add_layer(me, &me->mr->fdata, CD_MTFACE, layernum);
|
||||
multires_level_to_editmesh(ob, me, 0);
|
||||
multires_finish_mesh_update(ob);
|
||||
}
|
||||
else if(G.obedit) {
|
||||
EM_add_data_layer(&em->fdata, CD_MTFACE);
|
||||
|
@ -349,7 +349,7 @@ void multires_del_higher(void *ob, void *me)
|
||||
BIF_undo_push("Multires delete higher");
|
||||
}
|
||||
|
||||
static void multires_finish_mesh_update(Object *ob)
|
||||
void multires_finish_mesh_update(Object *ob)
|
||||
{
|
||||
/* friendly check for background render */
|
||||
if(G.background==0) {
|
||||
|
Loading…
Reference in New Issue
Block a user