[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16397] trunk/blender: object_find, didnt get images from an objects material textures

[Campbell Barton]

Revision: 16397
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16397
Author:   campbellbarton
Date:     2008-09-06 19:04:54 +0200 (Sat, 06 Sep 2008)

Log Message:
-----------
object_find, didnt get images from an objects material textures
KX_PythonInit.cpp - own error in recent commit.

Modified Paths:
--------------
    trunk/blender/release/scripts/object_find.py
    trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp

Modified: trunk/blender/release/scripts/object_find.py
===================================================================
--- trunk/blender/release/scripts/object_find.py	2008-09-06 16:53:44 UTC (rev 16396)
+++ trunk/blender/release/scripts/object_find.py	2008-09-06 17:04:54 UTC (rev 16397)
@@ -61,8 +61,20 @@
 	
 	me.activeUVLayer = orig_uvlayer
 	
+	
+	# Now get material images
+	for mat in me.materials:
+		if mat:
+			for mtex in mat.getTextures():
+				if mtex:
+					tex = mtex.tex
+					i = tex.getImage()
+					if i: unique_images[i.name] = i
+	
 	return unique_images.values()
 	
+	
+	
 	# Todo, support other object types, materials
 	return []
 	
@@ -118,7 +130,7 @@
 	def activate(ob, scn):
 		bpy.data.scenes.active = scn
 		scn.objects.selected = []
-		scn.Layers = ob.Layers
+		scn.Layers = ob.Layers & (1<<20)-1
 		ob.sel = 1
 	
 	def name_cmp(name_search, name_found):

Modified: trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2008-09-06 16:53:44 UTC (rev 16396)
+++ trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp	2008-09-06 17:04:54 UTC (rev 16397)
@@ -696,7 +696,7 @@
 	char *setting;
 	int enable, flag;
 
-	if (PyArg_ParseTuple(args,"si",&setting,&enable))
+	if (!PyArg_ParseTuple(args,"si",&setting,&enable))
 		return NULL;
 	
 	flag = getGLSLSettingFlag(setting);