[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36723] trunk/blender: fix [#27414] no-material renders differently in View3D vs BGE

[Campbell Barton]

Revision: 36723
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36723
Author:   campbellbarton
Date:     2011-05-17 02:44:52 +0000 (Tue, 17 May 2011)
Log Message:
-----------
fix [#27414] no-material renders differently in View3D vs BGE
when a texface layer exists this still overrides the default material.

Modified Paths:
--------------
    trunk/blender/build_files/cmake/cmake_netbeans_project.py
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    trunk/blender/source/gameengine/Ketsji/BL_Material.h

Modified: trunk/blender/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- trunk/blender/build_files/cmake/cmake_netbeans_project.py	2011-05-16 20:55:15 UTC (rev 36722)
+++ trunk/blender/build_files/cmake/cmake_netbeans_project.py	2011-05-17 02:44:52 UTC (rev 36723)
@@ -147,7 +147,7 @@
         f.write('  </logicalFolder>\n')
         # default, but this dir is infact not in blender dir so we can ignore it
         # f.write('  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>\n')
-        f.write('  <sourceFolderFilter>^(__pycache__|.*\.py)$</sourceFolderFilter>\n')
+        f.write('  <sourceFolderFilter>^(nbproject|__pycache__|.*\.py|.*\.html|.*\.blend)$</sourceFolderFilter>\n')
 
         f.write('  <sourceRootList>\n')
         f.write('    <Elem>%s</Elem>\n' % SOURCE_DIR)  # base_root_rel

Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2011-05-16 20:55:15 UTC (rev 36722)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2011-05-17 02:44:52 UTC (rev 36723)
@@ -460,7 +460,9 @@
 							}
 						}
 					}
-					material->flag[i] |= (mat->ipo!=0)?HASIPO:0;
+#if 0				/* this flag isnt used anymore */
+					material->flag[i] |= (BKE_animdata_from_id(mat->id) != NULL) ? HASIPO : 0;
+#endif
 					/// --------------------------------
 					// mapping methods
 					material->mapping[i].mapping |= ( mttmp->texco  & TEXCO_REFL	)?USEREFL:0;
@@ -835,6 +837,12 @@
 		else
 			ma = mesh->mat ? mesh->mat[mface->mat_nr]:NULL;
 
+		/* ckeck for texface since texface _only_ is used as a fallback */
+		if(ma == NULL && tface == NULL) {
+			extern Material defmaterial;	/* material.c */
+			ma= &defmaterial;
+		}
+
 		{
 			bool visible = true;
 			bool twoside = false;

Modified: trunk/blender/source/gameengine/Ketsji/BL_Material.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Material.h	2011-05-16 20:55:15 UTC (rev 36722)
+++ trunk/blender/source/gameengine/Ketsji/BL_Material.h	2011-05-17 02:44:52 UTC (rev 36723)
@@ -144,7 +144,7 @@
 	USEALPHA=4,		// use actual alpha channel
 	TEXALPHA=8,		// use alpha combiner functions
 	TEXNEG=16,		// negate blending
-	HASIPO=32,
+	/*HASIPO=32,*/	// unused, commeted for now.
 	USENEGALPHA=64
 };