[Bf-blender-cvs] [648956b5b5e] master: Fix T65976: switching to workbench engine in lookdev mode shows wrong state

[Brecht Van Lommel]

Commit: 648956b5b5ebf3741bba6352e8750bd4235fc325
Author: Brecht Van Lommel
Date:   Fri Jun 21 13:02:58 2019 +0200
Branches: master
https://developer.blender.org/rB648956b5b5ebf3741bba6352e8750bd4235fc325

Fix T65976: switching to workbench engine in lookdev mode shows wrong state

===================================================================

M	source/blender/makesrna/intern/rna_space.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 0c7797326db..2b51b1eee97 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -985,7 +985,7 @@ static int rna_3DViewShading_type_get(PointerRNA *ptr)
     return shading->type;
   }
   else if (BKE_scene_uses_blender_workbench(scene)) {
-    return (shading->type == OB_MATERIAL) ? OB_RENDER : shading->type;
+    return (shading->type == OB_MATERIAL) ? OB_SOLID : shading->type;
   }
   else {
     if (shading->type == OB_RENDER && !(type && type->view_draw)) {