[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59525] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: Remove dirty normals assert from drawobject.c

Sergey Sharybin sergey.vfx at gmail.com
Mon Aug 26 16:53:33 CEST 2013


Revision: 59525
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59525
Author:   nazgul
Date:     2013-08-26 14:53:33 +0000 (Mon, 26 Aug 2013)
Log Message:
-----------
Remove dirty normals assert from drawobject.c

Dirty normals already being checked in DerivedMesh.c,
and this things really rather be localized in one
single place than being checked all over the code.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-08-26 14:39:34 UTC (rev 59524)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2013-08-26 14:53:33 UTC (rev 59525)
@@ -3094,9 +3094,6 @@
 	BMVert *eve_act = NULL;
 	bool use_occlude_wire = (v3d->flag2 & V3D_OCCLUDE_WIRE) && (dt > OB_WIRE);
 	
-	// BLI_assert(!cageDM || !(cageDM->dirty & DM_DIRTY_NORMALS));
-	BLI_assert(!finalDM || !(finalDM->dirty & DM_DIRTY_NORMALS));
-
 	if (em->bm->selected.last) {
 		BMEditSelection *ese = em->bm->selected.last;
 		/* face is handeled above */
@@ -3369,8 +3366,6 @@
 	if (!dm)
 		return;
 
-	if (dm)  BLI_assert(!(dm->dirty & DM_DIRTY_NORMALS));
-
 	/* Check to draw dynamic paint colors (or weights from WeightVG modifiers).
 	 * Note: Last "preview-active" modifier in stack will win! */
 	if (DM_get_tessface_data_layer(dm, CD_PREVIEW_MCOL) && modifiers_isPreview(ob))




More information about the Bf-blender-cvs mailing list