[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26422] trunk/blender/source/blender/ blenkernel/intern/DerivedMesh.c: Fix #20221: switching to weight paint in textured viewport shading

[Brecht Van Lommel]

Revision: 26422
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26422
Author:   blendix
Date:     2010-01-30 10:27:49 +0100 (Sat, 30 Jan 2010)

Log Message:
-----------
Fix #20221: switching to weight paint in textured viewport shading
mode leaves objects blue.

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	2010-01-30 09:24:50 UTC (rev 26421)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c	2010-01-30 09:27:49 UTC (rev 26422)
@@ -1769,7 +1769,7 @@
 					CDDM_calc_normals(dm);
 				}
 
-				if(dataMask & CD_MASK_WEIGHT_MCOL)
+				if((dataMask & CD_MASK_WEIGHT_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT))
 					add_weight_mcol_dm(ob, dm);
 			}
 
@@ -1835,7 +1835,7 @@
 		CDDM_apply_vert_coords(finaldm, deformedVerts);
 		CDDM_calc_normals(finaldm);
 
-		if(dataMask & CD_MASK_WEIGHT_MCOL)
+		if((dataMask & CD_MASK_WEIGHT_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT))
 			add_weight_mcol_dm(ob, finaldm);
 	} else if(dm) {
 		finaldm = dm;
@@ -1847,7 +1847,7 @@
 			CDDM_calc_normals(finaldm);
 		}
 
-		if(dataMask & CD_MASK_WEIGHT_MCOL)
+		if((dataMask & CD_MASK_WEIGHT_MCOL) && (ob->mode & OB_MODE_WEIGHT_PAINT))
 			add_weight_mcol_dm(ob, finaldm);
 	}