Revision: 52794
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52794
Author:   campbellbarton
Date:     2012-12-06 08:10:24 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
fix [#31084] Dynamic Paint Blender File Crashes Blender.
was incorrect assert which didnt consider having no faces.

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

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c        
2012-12-06 06:13:43 UTC (rev 52793)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c        
2012-12-06 08:10:24 UTC (rev 52794)
@@ -392,7 +392,7 @@
        }
 
        else if (dm->dirty & DM_DIRTY_TESS_CDLAYERS) {
-               BLI_assert(CustomData_has_layer(&dm->faceData, CD_ORIGINDEX));
+               BLI_assert(CustomData_has_layer(&dm->faceData, CD_ORIGINDEX) || 
numTessFaces == 0);
                DM_update_tessface_data(dm);
        }
 

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to