diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-02 20:51:23 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-02 20:51:23 +0400 |
| commit | dc685bc1c3702c580dc29c1e5132d3e7bc4601e0 (patch) | |
| tree | 3538612f50827eda8f51ce763399956695ed66d6 /source/blender/makesrna/intern/rna_space.c | |
| parent | 0aada35e9331f58fc05884a2d885d28ae7a18386 (diff) | |
Fix #34711: matcap option not showing when switching from cycles material/rendered
draw mode to blender internal.
Diffstat (limited to 'source/blender/makesrna/intern/rna_space.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index a756fdab4f8..6ae4b9d2a49 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -536,6 +536,21 @@ static void rna_RegionView3D_update(ID *id, RegionView3D *rv3d) } } +static int rna_SpaceView3D_viewport_shade_get(PointerRNA *ptr) +{ + Scene *scene = ((bScreen *)ptr->id.data)->scene; + RenderEngineType *type = RE_engines_find(scene->r.engine); + View3D *v3d= (View3D*)ptr->data; + int drawtype = v3d->drawtype; + + if (drawtype == OB_MATERIAL && !BKE_scene_use_new_shading_nodes(scene)) + return OB_SOLID; + else if (drawtype == OB_RENDER && !(type && type->view_draw)) + return OB_SOLID; + + return drawtype; +} + static EnumPropertyItem *rna_SpaceView3D_viewport_shade_itemf(bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free) { @@ -553,7 +568,7 @@ static EnumPropertyItem *rna_SpaceView3D_viewport_shade_itemf(bContext *UNUSED(C if (BKE_scene_use_new_shading_nodes(scene)) RNA_enum_items_add_value(&item, &totitem, viewport_shade_items, OB_MATERIAL); - if (type->view_draw) + if (type && type->view_draw) RNA_enum_items_add_value(&item, &totitem, viewport_shade_items, OB_RENDER); RNA_enum_item_end(&item, &totitem); @@ -1696,7 +1711,7 @@ static void rna_def_space_view3d(BlenderRNA *brna) prop = RNA_def_property(srna, "viewport_shade", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "drawtype"); RNA_def_property_enum_items(prop, viewport_shade_items); - RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_SpaceView3D_viewport_shade_itemf"); + RNA_def_property_enum_funcs(prop, "rna_SpaceView3D_viewport_shade_get", NULL, "rna_SpaceView3D_viewport_shade_itemf"); RNA_def_property_ui_text(prop, "Viewport Shading", "Method to display/shade objects in the 3D View"); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_viewport_shade_update"); |