[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25962] trunk/blender/source/blender/ blenkernel/intern/modifier.c: check if the layer exists rather then getting the array.

[Campbell Barton]

Revision: 25962
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25962
Author:   campbellbarton
Date:     2010-01-13 13:17:21 +0100 (Wed, 13 Jan 2010)

Log Message:
-----------
check if the layer exists rather then getting the array.

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

Modified: trunk/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/modifier.c	2010-01-13 12:16:10 UTC (rev 25961)
+++ trunk/blender/source/blender/blenkernel/intern/modifier.c	2010-01-13 12:17:21 UTC (rev 25962)
@@ -3617,7 +3617,7 @@
 
 	/* UVs need special handling, since they come from faces */
 	if(texmapping == MOD_DISP_MAP_UV) {
-		if(dm->getFaceDataArray(dm, CD_MTFACE)) {
+		if(CustomData_has_layer(&dm->faceData, CD_MTFACE)) {
 			MFace *mface = dm->getFaceArray(dm);
 			MFace *mf;
 			char *done = MEM_callocN(sizeof(*done) * numVerts,
@@ -3699,8 +3699,8 @@
 	* if the texture didn't give an RGB value, copy the intensity across
 	*/
 	if(result_type & TEX_RGB)
-		texres->tin = (0.35 * texres->tr + 0.45 * texres->tg
-				+ 0.2 * texres->tb);
+		texres->tin = (0.35f * texres->tr + 0.45f * texres->tg
+				+ 0.2f * texres->tb);
 	else
 		texres->tr = texres->tg = texres->tb = texres->tin;
 }
@@ -3924,8 +3924,9 @@
 	if(num_projectors == 0) return dm;
 
 	/* make sure there are UV layers available */
-	if(!dm->getFaceDataArray(dm, CD_MTFACE)) return dm;
 
+	if(!CustomData_has_layer(&dm->faceData, CD_MTFACE)) return dm;
+
 	/* make sure we're using an existing layer */
 	validate_layer_name(&dm->faceData, CD_MTFACE, umd->uvlayer_name, uvname);
 
@@ -5185,7 +5186,7 @@
 
 	/* UVs need special handling, since they come from faces */
 	if(texmapping == MOD_WAV_MAP_UV) {
-		if(dm->getFaceDataArray(dm, CD_MTFACE)) {
+		if(CustomData_has_layer(&dm->faceData, CD_MTFACE)) {
 			MFace *mface = dm->getFaceArray(dm);
 			MFace *mf;
 			char *done = MEM_callocN(sizeof(*done) * numVerts,