[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57797] branches/soc-2013-bge/source/ blender/blenkernel/intern/material.c: Fixing a crash that occurred when give_current_material was passed a NULL object .

[Daniel Stokes]

Revision: 57797
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57797
Author:   kupoman
Date:     2013-06-26 23:37:31 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
Fixing a crash that occurred when give_current_material was passed a NULL 
object.

Modified Paths:
--------------
    branches/soc-2013-bge/source/blender/blenkernel/intern/material.c

Modified: branches/soc-2013-bge/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/soc-2013-bge/source/blender/blenkernel/intern/material.c   
2013-06-26 23:35:45 UTC (rev 57796)
+++ branches/soc-2013-bge/source/blender/blenkernel/intern/material.c   
2013-06-26 23:37:31 UTC (rev 57797)
@@ -623,7 +623,7 @@
        Material ***matarar, *ma;
        short *totcolp;
        
-       if (BKE_object_lod_check(ob, NULL)) {
+       if (ob && BKE_object_lod_check(ob, NULL)) {
                ob = BKE_object_lod_matob_get(ob);
        }
 

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