diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-08-04 14:28:21 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-08-04 14:28:21 +0300 |
| commit | ca606bf55165881896467f6a5c09e5870c847fbb (patch) | |
| tree | e64b693bc0b0b9bcfaa17e687442c02c0791928e /source/blender/draw/intern | |
| parent | 0dff6b2b4bd74107f3736617d0572d0a47d7383f (diff) | |
| parent | 164f40c50a05ad4e1696cdd0f55de96c210a125a (diff) | |
Merge branch 'blender-v2.90-release' into master
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 49b12aecf28..61c9bf65507 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1960,7 +1960,7 @@ void DRW_render_instance_buffer_finish(void) void DRW_draw_select_loop(struct Depsgraph *depsgraph, ARegion *region, View3D *v3d, - bool UNUSED(use_obedit_skip), + bool use_obedit_skip, bool draw_surface, bool UNUSED(use_nearest), const rcti *rect, @@ -1973,7 +1973,7 @@ void DRW_draw_select_loop(struct Depsgraph *depsgraph, RenderEngineType *engine_type = ED_view3d_engine_type(scene, v3d->shading.type); ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph); Object *obact = OBACT(view_layer); - Object *obedit = OBEDIT_FROM_OBACT(obact); + Object *obedit = use_obedit_skip ? NULL : OBEDIT_FROM_OBACT(obact); #ifndef USE_GPU_SELECT UNUSED_VARS(scene, view_layer, v3d, region, rect); #else |