Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix changing shape key in multi-object edit mode

Browse Source 
Updating only accounted for the active object.
This commit is contained in:
Campbell Barton
2020-01-30 13:21:49 +11:00
parent c27d30f3ea
commit ccb3cb0b9b
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/blender/makesrna/intern/rna_object.c
View File

@@ -375,36 +375,44 @@ static void rna_Object_matrix_basis_set(PointerRNA *ptr, const float values[16])
BKE_object_apply_mat4(ob, (float(*)[4])values, false, false); BKE_object_apply_mat4(ob, (float(*)[4])values, false, false);
} }
void rna_Object_internal_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) void rna_Object_internal_update_data_impl(PointerRNA *ptr)
{ {
DEG_id_tag_update(ptr->owner_id, ID_RECALC_GEOMETRY); DEG_id_tag_update(ptr->owner_id, ID_RECALC_GEOMETRY);
WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->owner_id); WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->owner_id);
} }
void rna_Object_internal_update_data_dependency(Main *bmain, Scene *scene, PointerRNA *ptr) void rna_Object_internal_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
{ {
DEG_relations_tag_update(bmain); rna_Object_internal_update_data_impl(ptr);
rna_Object_internal_update_data(bmain, scene, ptr);
} }
static void rna_Object_active_shape_update(bContext *C, PointerRNA *ptr) void rna_Object_internal_update_data_dependency(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{
DEG_relations_tag_update(bmain);
rna_Object_internal_update_data_impl(ptr);
}
static void rna_Object_active_shape_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
{ {
Object *ob = (Object *)ptr->owner_id; Object *ob = (Object *)ptr->owner_id;
Main *bmain = CTX_data_main(C);
Scene *scene = CTX_data_scene(C);
if (CTX_data_edit_object(C) == ob) { if (BKE_object_is_in_editmode(ob)) {
/* exit/enter editmode to get new shape */ /* exit/enter editmode to get new shape */
switch (ob->type) { switch (ob->type) {
case OB_MESH: case OB_MESH: {
Mesh *me = ob->data;
BMEditMesh *em = me->edit_mesh;
int select_mode = em->selectmode;
EDBM_mesh_load(bmain, ob); EDBM_mesh_load(bmain, ob);
EDBM_mesh_make(ob, scene->toolsettings->selectmode, true); EDBM_mesh_make(ob, select_mode, true);
em = me->edit_mesh;
DEG_id_tag_update(ob->data, 0); DEG_id_tag_update(&me->id, 0);
EDBM_mesh_normals_update(((Mesh *)ob->data)->edit_mesh); EDBM_mesh_normals_update(em);
BKE_editmesh_looptri_calc(((Mesh *)ob->data)->edit_mesh); BKE_editmesh_looptri_calc(em);
break; break;
}
case OB_CURVE: case OB_CURVE:
case OB_SURF: case OB_SURF:
ED_curve_editnurb_load(bmain, ob); ED_curve_editnurb_load(bmain, ob);
@@ -417,7 +425,7 @@ static void rna_Object_active_shape_update(bContext *C, PointerRNA *ptr)
} }
} }
rna_Object_internal_update_data(bmain, scene, ptr); rna_Object_internal_update_data_impl(ptr);
} }
static void rna_Object_dependency_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr) static void rna_Object_dependency_update(Main *bmain, Scene *UNUSED(scene), PointerRNA *ptr)
@@ -3097,7 +3105,6 @@ static void rna_def_object(BlenderRNA *brna)
prop = RNA_def_property(srna, "active_shape_key_index", PROP_INT, PROP_NONE); prop = RNA_def_property(srna, "active_shape_key_index", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "shapenr"); RNA_def_property_int_sdna(prop, NULL, "shapenr");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); /* XXX this is really unpredictable... */ RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); /* XXX this is really unpredictable... */
RNA_def_property_int_funcs(prop, RNA_def_property_int_funcs(prop,
"rna_Object_active_shape_key_index_get", "rna_Object_active_shape_key_index_get",