diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2020-03-23 15:30:26 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2020-03-23 15:30:26 +0300 |
commit | 64982e213f014123d1b0406cf9ae893910a6a3d3 (patch) | |
tree | 67f3dc76ea1a73a4892e7b334d627812c271f1bd /source/blender/editors | |
parent | bceb91ffd23c3bc09cce935a4f6d72f91392dc77 (diff) |
COW: Edit Mesh: Do not copy the looptris pointer
No functional changes.
Differential Revision: https://developer.blender.org/D7173
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/mesh/editmesh_undo.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/object/object_hook.c | 1 | ||||
-rw-r--r-- | source/blender/editors/object/object_relations.c | 1 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 1 |
5 files changed, 7 insertions, 0 deletions
diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index 1f857ad4710..c1cff2883ac 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -40,6 +40,7 @@ #include "BKE_undo_system.h" #include "DEG_depsgraph.h" +#include "DEG_depsgraph_query.h" #include "ED_mesh.h" #include "ED_object.h" @@ -600,6 +601,7 @@ static void undomesh_to_editmesh(UndoMesh *um, Object *ob, BMEditMesh *em, Key * .active_shapekey = um->shapenr, })); + BLI_assert(DEG_is_original_object(ob)); em_tmp = BKE_editmesh_create(bm, true); *em = *em_tmp; diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 7faad5cdd0e..45c09184404 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -82,6 +82,7 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" +#include "DEG_depsgraph_query.h" #include "ED_anim_api.h" #include "ED_armature.h" @@ -618,6 +619,7 @@ bool ED_object_editmode_enter_ex(Main *bmain, Scene *scene, Object *ob, int flag em = BKE_editmesh_from_object(ob); if (LIKELY(em)) { + BLI_assert(DEG_is_original_object(ob)); /* order doesn't matter */ EDBM_mesh_normals_update(em); BKE_editmesh_looptri_calc(em); diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c index 4414acff115..90a43ed9777 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -351,6 +351,7 @@ static bool object_hook_index_array(Main *bmain, em = me->edit_mesh; + BLI_assert(DEG_is_original_object(obedit)); EDBM_mesh_normals_update(em); BKE_editmesh_looptri_calc(em); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 7c8a9750b36..d62d543256e 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -151,6 +151,7 @@ static int vertex_parent_set_exec(bContext *C, wmOperator *op) em = me->edit_mesh; + BLI_assert(DEG_is_original_object(obedit)); EDBM_mesh_normals_update(em); BKE_editmesh_looptri_calc(em); diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 7a787b77a62..e521376ff0e 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -855,6 +855,7 @@ static void recalcData_objects(TransInfo *t) FOREACH_TRANS_DATA_CONTAINER (t, tc) { DEG_id_tag_update(tc->obedit->data, 0); /* sets recalc flags */ + BLI_assert(DEG_is_original_object(tc->obedit)); BMEditMesh *em = BKE_editmesh_from_object(tc->obedit); EDBM_mesh_normals_update(em); BKE_editmesh_looptri_calc(em); |