Commit: 7721886eadffc3eb07ac2d8c19cf5f4d12cb3f1c
Author: Campbell Barton
Date: Tue Dec 18 13:56:26 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB7721886eadffc3eb07ac2d8c19cf5f4d12cb3f1c
Fix T53544: Crash drawing scene w/o world
===================================================================
M source/blender/editors/space_view3d/view3d_utils.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_utils.c
b/source/blender/editors/space_view3d/view3d_utils.c
index 87f2e6b32d4..540806d4b67 100644
--- a/source/blender/editors/space_view3d/view3d_utils.c
+++ b/source/blender/editors/space_view3d/view3d_utils.c
@@ -77,18 +77,18 @@
void ED_view3d_background_color_get(const Scene *scene, const View3D *v3d,
float r_color[3])
{
- switch (v3d->shading.background_type) {
- case V3D_SHADING_BACKGROUND_WORLD:
+ if (v3d->shading.background_type == V3D_SHADING_BACKGROUND_WORLD) {
+ if (scene->world) {
copy_v3_v3(r_color, &scene->world->horr);
- break;
- case V3D_SHADING_BACKGROUND_VIEWPORT:
- copy_v3_v3(r_color, v3d->shading.background_color);
- break;
- case V3D_SHADING_BACKGROUND_THEME:
- default:
- UI_GetThemeColor3fv(TH_HIGH_GRAD, r_color);
- break;
+ return;
+ }
}
+ else if (v3d->shading.background_type ==
V3D_SHADING_BACKGROUND_VIEWPORT) {
+ copy_v3_v3(r_color, v3d->shading.background_color);
+ return;
+ }
+
+ UI_GetThemeColor3fv(TH_HIGH_GRAD, r_color);
}
void ED_view3d_cursor3d_calc_mat3(const Scene *scene, float mat[3][3])
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
