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:
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 5316520ccab..166684e7230 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1245,16 +1245,15 @@ static void view3d_draw_view(const bContext *C, ARegion *ar)
RenderEngineType *ED_view3d_engine_type(Scene *scene, int drawtype)
{
- /* Tempory viewport draw modes until we have a proper system. */
- if (drawtype == OB_RENDER) {
- return RE_engines_find(scene->r.engine);
- }
- else if (drawtype == OB_MATERIAL) {
+ /*
+ * Tempory viewport draw modes until we have a proper system.
+ * all modes are done in the draw manager, except
+ * cycles material as it is an external render engine.
+ */
+ if (strcmp(scene->r.engine, RE_engine_id_CYCLES) == 0 && drawtype == OB_MATERIAL) {
return RE_engines_find(RE_engine_id_BLENDER_EEVEE);
}
- else {
- return RE_engines_find(RE_engine_id_BLENDER_WORKBENCH);
- }
+ return RE_engines_find(scene->r.engine);
}
void view3d_main_region_draw(const bContext *C, ARegion *ar)