griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T58756: crash changing shading.type in 3D viewport in inactive screen.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-12-05 14:35:55 +01:00
parent 6122e1d6c0
commit be359fc6e5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/makesrna/intern/rna_space.c
View File

@@ -713,10 +713,10 @@ static int rna_3DViewShading_type_get(PointerRNA *ptr)
{
/* Available shading types depend on render engine. */
Scene *scene = rna_3DViewShading_scene(ptr);
RenderEngineType *type = RE_engines_find(scene->r.engine);
RenderEngineType *type = (scene) ? RE_engines_find(scene->r.engine) : NULL;
View3DShading *shading = (View3DShading *)ptr->data;
if (BKE_scene_uses_blender_eevee(scene)) {
if (scene == NULL || BKE_scene_uses_blender_eevee(scene)) {
return shading->type;
}
else if (BKE_scene_uses_blender_workbench(scene)) {
@@ -746,7 +746,7 @@ static const EnumPropertyItem *rna_3DViewShading_type_itemf(
PropertyRNA *UNUSED(prop), bool *r_free)
{
Scene *scene = rna_3DViewShading_scene(ptr);
RenderEngineType *type = RE_engines_find(scene->r.engine);
RenderEngineType *type = (scene) ? RE_engines_find(scene->r.engine) : NULL;
EnumPropertyItem *item = NULL;
int totitem = 0;
@@ -754,7 +754,7 @@ static const EnumPropertyItem *rna_3DViewShading_type_itemf(
RNA_enum_items_add_value(&item, &totitem, rna_enum_shading_type_items, OB_WIRE);
RNA_enum_items_add_value(&item, &totitem, rna_enum_shading_type_items, OB_SOLID);
if (BKE_scene_uses_blender_eevee(scene)) {
if (scene == NULL || BKE_scene_uses_blender_eevee(scene)) {
RNA_enum_items_add_value(&item, &totitem, rna_enum_shading_type_items, OB_MATERIAL);
RNA_enum_items_add_value(&item, &totitem, rna_enum_shading_type_items, OB_RENDER);
}