[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45402] trunk/blender/source/blender/ blenkernel/intern/customdata.c: Fix bug [#30810] Blender crashes with Array modifier

[Nicholas Bishop]

Revision: 45402
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45402
Author:   nicholasbishop
Date:     2012-04-04 16:35:13 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
Fix bug [#30810] Blender crashes with Array modifier

When merging bmesh customdata, memset the new blocks to
zero. Otherwise can contain junk values (some layer types with
pointers like MDeformVert can then crash.)

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

Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-04-04 
16:11:44 UTC (rev 45401)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-04-04 
16:35:13 UTC (rev 45402)
@@ -2251,8 +2251,11 @@
        const LayerTypeInfo *typeInfo;
        int dest_i, src_i;
 
-       if (!*dest_block)
+       if (!*dest_block) {
                CustomData_bmesh_alloc_block(dest, dest_block);
+               if (*dest_block)
+                       memset(*dest_block, 0, dest->totsize);
+       }
        
        /* copies a layer at a time */
        dest_i = 0;

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