[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25758] trunk/blender/source/blender/ editors/space_view3d/view3d_draw.c: fix for [#20352] Crash when rendering viewport
Campbell Barton
ideasman42 at gmail.com
Wed Jan 6 01:02:38 CET 2010
Revision: 25758
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25758
Author: campbellbarton
Date: 2010-01-06 01:02:37 +0100 (Wed, 06 Jan 2010)
Log Message:
-----------
fix for [#20352] Crash when rendering viewport
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2010-01-05 22:33:41 UTC (rev 25757)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2010-01-06 00:02:37 UTC (rev 25758)
@@ -1953,8 +1953,16 @@
G.f |= G_RENDER_OGL;
GPU_free_images();
- /* set background color */
- glClearColor(scene->world->horr, scene->world->horg, scene->world->horb, 0.0);
+ /* set background color, fallback on the view background color */
+ if(scene->world) {
+ glClearColor(scene->world->horr, scene->world->horg, scene->world->horb, 0.0);
+ }
+ else {
+ float col[3];
+ UI_GetThemeColor3fv(TH_BACK, col);
+ glClearColor(col[0], col[1], col[2], 0.0);
+ }
+
glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
/* setup view matrices */
More information about the Bf-blender-cvs
mailing list