diff options
author | Germano Cavalcante <germano.costa@ig.com.br> | 2020-03-23 20:18:36 +0300 |
---|---|---|
committer | Germano Cavalcante <germano.costa@ig.com.br> | 2020-03-23 20:18:36 +0300 |
commit | b701af328a2b2d7557bb1f6d511ff664ebce5abb (patch) | |
tree | fb870b43234bd2b7155e8fd996cf9819469f59a1 /source/blender/editors | |
parent | ed386507e19543decf2422e96610284da8c98112 (diff) |
Revert "COW: Edit Mesh: Do not copy the looptris pointer"
The looptri is repeated in the linked Meshes but the pointer
is only referenced in the evaluated ones.
This reverts commit 64982e213f014123d1b0406cf9ae893910a6a3d3.
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, 0 insertions, 7 deletions
diff --git a/source/blender/editors/mesh/editmesh_undo.c b/source/blender/editors/mesh/editmesh_undo.c index c1cff2883ac..1f857ad4710 100644 --- a/source/blender/editors/mesh/editmesh_undo.c +++ b/source/blender/editors/mesh/editmesh_undo.c @@ -40,7 +40,6 @@ #include "BKE_undo_system.h" #include "DEG_depsgraph.h" -#include "DEG_depsgraph_query.h" #include "ED_mesh.h" #include "ED_object.h" @@ -601,7 +600,6 @@ 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 45c09184404..7faad5cdd0e 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -82,7 +82,6 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "DEG_depsgraph_query.h" #include "ED_anim_api.h" #include "ED_armature.h" @@ -619,7 +618,6 @@ 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 90a43ed9777..4414acff115 100644 --- a/source/blender/editors/object/object_hook.c +++ b/source/blender/editors/object/object_hook.c @@ -351,7 +351,6 @@ 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 d62d543256e..7c8a9750b36 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -151,7 +151,6 @@ 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 e521376ff0e..7a787b77a62 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -855,7 +855,6 @@ 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); |