[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20560] branches/bb_dev/source/blender/src /buttons_shading.c: Fix NULL pointer crash.

Benoit Bolsee benoit.bolsee at online.be
Mon Jun 1 19:17:21 CEST 2009


Revision: 20560
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20560
Author:   ben2610
Date:     2009-06-01 19:17:21 +0200 (Mon, 01 Jun 2009)

Log Message:
-----------
Fix NULL pointer crash.

Modified Paths:
--------------
    branches/bb_dev/source/blender/src/buttons_shading.c

Modified: branches/bb_dev/source/blender/src/buttons_shading.c
===================================================================
--- branches/bb_dev/source/blender/src/buttons_shading.c	2009-06-01 16:35:05 UTC (rev 20559)
+++ branches/bb_dev/source/blender/src/buttons_shading.c	2009-06-01 17:17:21 UTC (rev 20560)
@@ -4231,7 +4231,7 @@
 			uiDefButBitI(block, TOG, MA_ENV, B_MATPRV,	"Env",			82,146,74,20, &(ma->mode), 0, 0, 0, 0, "Causes faces to render with alpha zero: allows sky/backdrop to show through (only for solid faces)");
 			uiDefButBitS(block, TOG, MA_OBCOLOR, B_MATPRV, "ObColor",		156,146,60,20, &(ma->shade_flag), 0, 0, 0, 0, "Modulate the result with a per object color");
 			uiDefButF(block, NUM, B_NOP, "Shad A ",					216,146,87,20, &ma->shad_alpha, 0.001, 1.0f, 10, 2, "Shadow casting alpha, only in use for Irregular Shadowbuffer");
-			if (draw_glsl_material(NULL, G.vd->drawtype)) {
+			if (G.vd && draw_glsl_material(NULL, G.vd->drawtype)) {
 				// only display option if we are likely to use GLSL shaders
 				uiBlockSetCol(block, TH_AUTO);
 				uiDefBut(block, BUT, B_EXPORTSHADER,	"Export GLSL shader",	8,126,148,20, NULL, 0, 0, 0, 0, "Export GLSL shader in text file called <material>.fg and <material>.vx");





More information about the Bf-blender-cvs mailing list