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>2018-02-06 08:10:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-02-06 10:03:28 +0300
commit28dfc47cf0b068d0103986424f79eeea59f2039b (patch)
tree5be77cc019cb6deda3416e0dc2385b48eac1232a /source/blender/editors/space_view3d
parent1c600cc643306c12f2bc652b2ea921ecbb3cfadf (diff)
Object Mode: Add to EvaluationContext & DRWContextState
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c6
-rw-r--r--source/blender/editors/space_view3d/view3d_view.c8
2 files changed, 10 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index f734bb085d0..3c4cc4d11b9 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -752,7 +752,7 @@ void ED_view3d_draw_depth(
else
#endif /* WITH_OPENGL_LEGACY */
{
- DRW_draw_depth_loop(graph, ar, v3d);
+ DRW_draw_depth_loop(graph, ar, v3d, eval_ctx->object_mode);
}
if (rv3d->rflag & RV3D_CLIPPING) {
@@ -2076,7 +2076,9 @@ void ED_view3d_draw_offscreen(
}
}
else {
- DRW_draw_render_loop_offscreen(depsgraph, eval_ctx->engine_type, ar, v3d, do_sky, ofs, viewport);
+ DRW_draw_render_loop_offscreen(
+ depsgraph, eval_ctx->engine_type, ar, v3d, eval_ctx->object_mode,
+ do_sky, ofs, viewport);
}
/* restore size */
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index 0597f2806b3..779c2cc53d4 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -954,7 +954,9 @@ int view3d_opengl_select(
else
#else
{
- DRW_draw_select_loop(graph, ar, v3d, use_obedit_skip, use_nearest, &rect);
+ DRW_draw_select_loop(
+ graph, ar, v3d, eval_ctx->object_mode,
+ use_obedit_skip, use_nearest, &rect);
}
#endif /* WITH_OPENGL_LEGACY */
@@ -971,7 +973,9 @@ int view3d_opengl_select(
else
#else
{
- DRW_draw_select_loop(graph, ar, v3d, use_obedit_skip, use_nearest, &rect);
+ DRW_draw_select_loop(
+ graph, ar, v3d, eval_ctx->object_mode,
+ use_obedit_skip, use_nearest, &rect);
}
#endif /* WITH_OPENGL_LEGACY */