[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14324] trunk/blender/source/blender/ render/intern/source/occlusion.c:

[Brecht Van Lommel]

Revision: 14324
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14324
Author:   blendix
Date:     2008-04-03 02:40:53 +0200 (Thu, 03 Apr 2008)

Log Message:
-----------

Bugfix: crash with strand surface AAO and layer ipo's.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/occlusion.c

Modified: trunk/blender/source/blender/render/intern/source/occlusion.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/occlusion.c       
2008-04-02 23:59:25 UTC (rev 14323)
+++ trunk/blender/source/blender/render/intern/source/occlusion.c       
2008-04-03 00:40:53 UTC (rev 14324)
@@ -1475,7 +1475,7 @@
        int *face, *index = RE_strandren_get_face(shi->obr, strand, 0);
        float w[4], *co1, *co2, *co3, *co4;
 
-       if(mesh && index) {
+       if(mesh && mesh->face && mesh->co && mesh->col && index) {
                face= mesh->face[*index];
 
                co1= mesh->co[face[0]];
@@ -1555,6 +1555,9 @@
                        occ_compute_passes(re, re->occlusiontree, 
re->wrld.ao_approx_passes);
 
                for(mesh=re->strandsurface.first; mesh; mesh=mesh->next) {
+                       if(!mesh->face || !mesh->co || !mesh->col)
+                               continue;
+
                        count= MEM_callocN(sizeof(int)*mesh->totvert, 
"OcclusionCount");
                        facecol= MEM_callocN(sizeof(float)*3*mesh->totface, 
"StrandSurfFaceCol");
 


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