[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48950] trunk/blender/source/blender/ blenkernel/intern/mask_rasterize.c: fix crash for empty or single vertex layers.

[Campbell Barton]

Revision: 48950
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48950
Author:   campbellbarton
Date:     2012-07-16 07:04:10 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
fix crash for empty or single vertex layers.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c

Modified: trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c     
2012-07-16 06:39:40 UTC (rev 48949)
+++ trunk/blender/source/blender/blenkernel/intern/mask_rasterize.c     
2012-07-16 07:04:10 UTC (rev 48950)
@@ -617,10 +617,6 @@
                                                        sf_vert_tot++;
                                                }
 
-                                               if (diff_feather_points) {
-                                                       
MEM_freeN(diff_feather_points);
-                                               }
-
                                                tot_feather_quads += 
tot_diff_point;
                                        }
                                }
@@ -673,8 +669,6 @@
                                                        tot_feather_quads -= 2;
                                                }
 
-                                               MEM_freeN(diff_feather_points);
-
                                                /* ack these are infact tris, 
but they are extra faces so no matter,
                                                 * +1 becausing adding one vert 
results in 2 tris (joining the existing endpoints)
                                                 */
@@ -687,9 +681,13 @@
                        if (diff_points) {
                                MEM_freeN(diff_points);
                        }
+
+                       if (diff_feather_points) {
+                               MEM_freeN(diff_feather_points);
+                       }
                }
 
-               if (sf_ctx.fillvertbase.first) {
+               {
                        unsigned int (*face_array)[4], *face;  /* access coords 
*/
                        float        (*face_coords)[3], *cos; /* xy, z 0-1 (1.0 
== filled) */
                        int sf_tri_tot;

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