[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21422] branches/soc-2009-imbusy/source/ blender/editors/space_view3d/drawobject.c: weight paint mode works

Lukas Steiblys imbusy at imbusy.org
Wed Jul 8 12:46:59 CEST 2009


Revision: 21422
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21422
Author:   imbusy
Date:     2009-07-08 12:46:57 +0200 (Wed, 08 Jul 2009)

Log Message:
-----------
weight paint mode works

Modified Paths:
--------------
    branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawobject.c

Modified: branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawobject.c	2009-07-08 10:40:26 UTC (rev 21421)
+++ branches/soc-2009-imbusy/source/blender/editors/space_view3d/drawobject.c	2009-07-08 10:46:57 UTC (rev 21422)
@@ -5633,9 +5633,12 @@
 		}
 	}
 		
+	CustomData_free_layers( &dm->faceData, CD_WEIGHT_MCOL, dm->getNumFaces(dm) );
 	CustomData_add_layer( &dm->faceData, CD_WEIGHT_MCOL, CD_ASSIGN, colors, dm->numFaceData );
-	GPU_buffer_free(dm->drawObject->colors,0);
-	dm->drawObject->colors = 0;
+	if( !GPU_buffer_legacy(dm) ) {
+		GPU_buffer_free(dm->drawObject->colors,0);
+		dm->drawObject->colors = 0;
+	}
 	dm->drawMappedFaces(dm, bbs_mesh_solid__setDrawOpts, me, 1);
 	CustomData_free_layer( &dm->faceData, CD_WEIGHT_MCOL, dm->getNumFaces(dm), 0 );
 





More information about the Bf-blender-cvs mailing list