[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26744] trunk/blender/source/blender/ blenkernel/intern: fix for last commit

[Campbell Barton]

Revision: 26744
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26744
Author:   campbellbarton
Date:     2010-02-09 19:18:36 +0100 (Tue, 09 Feb 2010)

Log Message:
-----------
fix for last commit

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

Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2010-02-09 18:06:57 UTC (rev 26743)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2010-02-09 18:18:36 UTC (rev 26744)
@@ -2125,9 +2125,9 @@
 	Object *obact = scene->basact?scene->basact->object:NULL;
 	int editing = paint_facesel_test(ob);
 	/* weight paint and face select need original indicies because of selection buffer drawing */
-	int needMapping = (ob==obact) && (editing || (ob->mode & OB_MODE_WEIGHT_PAINT) || paint_facesel_test(ob));
+	int needMapping = (ob==obact) && (editing || (ob->mode & OB_MODE_WEIGHT_PAINT) || editing);
 	float min[3], max[3];
-	printf("needMapping, %d\n", needMapping);
+
 	clear_mesh_caches(ob);
 
 	mesh_calc_modifiers(scene, ob, NULL, &ob->derivedDeform,

Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2010-02-09 18:06:57 UTC (rev 26743)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c	2010-02-09 18:18:36 UTC (rev 26744)
@@ -1021,7 +1021,7 @@
 		char *varray = 0;
 		int numdata = 0, elementsize = 0, offset;
 		int start = 0, numfaces = 0, prevdraw = 0, curface = 0;
-		GPUAttrib datatypes[32];
+		GPUAttrib datatypes[GPU_MAX_ATTRIB]; /* TODO, messing up when switching materials many times - [#21056]*/
 		memset(&attribs, 0, sizeof(attribs));
 
 		GPU_vertex_setup(dm);