Revision: 20920
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20920
Author: yukishiro
Date: 2009-06-16 08:15:16 +0200 (Tue, 16 Jun 2009)
Log Message:
-----------
fix two null checks
Modified Paths:
--------------
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-yukishiro/source/blender/render/intern/source/rendercore.c
Modified:
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
===================================================================
---
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
2009-06-16 05:34:24 UTC (rev 20919)
+++
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
2009-06-16 06:15:16 UTC (rev 20920)
@@ -2281,7 +2281,7 @@
static void calc_sh_vert_color(Object *ob, int index, MShCoeffs *mco, float
(*lco)[3], unsigned char *col)
{
Mesh *me = ob->data;
- Material * mat;
+ Material * mat = NULL;
float color[3];
float brightness[3];
int k;
Modified:
branches/soc-2009-yukishiro/source/blender/render/intern/source/rendercore.c
===================================================================
---
branches/soc-2009-yukishiro/source/blender/render/intern/source/rendercore.c
2009-06-16 05:34:24 UTC (rev 20919)
+++
branches/soc-2009-yukishiro/source/blender/render/intern/source/rendercore.c
2009-06-16 06:15:16 UTC (rev 20920)
@@ -1167,9 +1167,11 @@
int width = R.disprect.xmax - R.disprect.xmin;
int height = R.disprect.ymax - R.disprect.ymin;
- SH_LightProbePreview(R.scene->lightenv, width, height,
- pa->disprect.xmin, pa->disprect.ymin,
- pa->disprect.xmax, pa->disprect.ymax, fcol);
+ if (R.scene->lightenv) {
+ SH_LightProbePreview(R.scene->lightenv, width,
height,
+ pa->disprect.xmin, pa->disprect.ymin,
+ pa->disprect.xmax, pa->disprect.ymax,
fcol);
+ }
}
/* transp layer */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
