archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T53544: Crash drawing scene w/o world

Browse Source
This commit is contained in:
Campbell Barton
2018-12-18 13:56:26 +11:00
parent ac80ceae77
commit 7721886ead
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/space_view3d/view3d_utils.c
View File

@@ -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])