Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-12-03 02:44:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-12-03 02:54:12 +0300
commit6e10ad5ea825783ff044973849358d8ef0759ec3 (patch)
treea6ae77967d2c74aa30cac7277413c65b6aced6e7 /source/blender/editors/object
parent285b09d8b9717925d97e8fc0aa8903f7d6cff29a (diff)
Fix T46913: Crash adding hook to linked mesh dupli
Follow up to T46738, we need to tag the object data for recalculation.
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_hook.c2
-rw-r--r--source/blender/editors/object/object_relations.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 6a1220bbbaa..492b6724f93 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -318,7 +318,7 @@ static bool object_hook_index_array(Scene *scene, Object *obedit,
EDBM_mesh_load(obedit);
EDBM_mesh_make(scene->toolsettings, obedit);
- DAG_id_tag_update(&obedit->id, 0);
+ DAG_id_tag_update(obedit->data, 0);
em = me->edit_btmesh;
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index c638714a951..a1f59166c81 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -138,6 +138,8 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op)
EDBM_mesh_load(obedit);
EDBM_mesh_make(scene->toolsettings, obedit);
+ DAG_id_tag_update(obedit->data, 0);
+
em = me->edit_btmesh;
EDBM_mesh_normals_update(em);