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>2020-02-04 11:02:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-02-04 11:02:03 +0300
commit77702245b1295ce50de7342f3f26f4f7000b2a48 (patch)
tree2a0ed319a6cf32ef89c86f1d55880c0b08df27c2 /source/blender/draw/intern/draw_cache_impl_mesh.c
parentc482e22f3fff291183683fee29c352ef57edd166 (diff)
parentd09646a40b1928308025d8ceb2c2d505651fc9a4 (diff)
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_mesh.c')
-rw-r--r--source/blender/draw/intern/draw_cache_impl_mesh.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 87f93bf6fd6..7408c8d0e38 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -996,13 +996,7 @@ void DRW_mesh_batch_cache_create_requested(
BLI_assert(me->edit_mesh->mesh_eval_final != NULL);
}
- const bool is_editmode =
- (me->edit_mesh != NULL) &&
- (/* Simple case, the object is in edit-mode with an edit-mesh. */
- (ob->mode & OB_MODE_EDIT) ||
- /* This is needed so linked duplicates show updates while the user edits the mesh.
- * While this is not essential, it's useful to see the edit-mode changes everywhere. */
- (me->edit_mesh->mesh_eval_final != NULL));
+ const bool is_editmode = (me->edit_mesh != NULL) && DRW_object_is_in_edit_mode(ob);
DRWBatchFlag batch_requested = cache->batch_requested;
cache->batch_requested = 0;