[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28220] trunk/blender/source/blender/ editors/render/render_preview.c: Fix for possible null pointer, from uncle entity in irc

[Matt Ebb]

Revision: 28220
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28220
Author:   broken
Date:     2010-04-16 06:44:15 +0200 (Fri, 16 Apr 2010)

Log Message:
-----------
Fix for possible null pointer, from uncle entity in irc

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c        
2010-04-16 04:24:29 UTC (rev 28219)
+++ trunk/blender/source/blender/editors/render/render_preview.c        
2010-04-16 04:44:15 UTC (rev 28220)
@@ -346,7 +346,7 @@
                                }
 
                                
-                               if(sp->pr_method==PR_ICON_RENDER) {
+                               if(sp && sp->pr_method==PR_ICON_RENDER) {
                                        if (mat->material_type == MA_TYPE_HALO) 
{
                                                sce->lay= 1<<MA_FLAT;
                                        } 
@@ -406,7 +406,7 @@
                                }
                        }
 
-                       if(tex && tex->nodetree && 
sp->pr_method==PR_NODE_RENDER)
+                       if(tex && tex->nodetree && sp && 
sp->pr_method==PR_NODE_RENDER)
                                ntreeInitPreview(tex->nodetree, sp->sizex, 
sp->sizey);
                }
                else if(id_type==ID_LA) {


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs