[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31522] trunk/blender: - rna py-api bug fix, a NULL item in a collection was raising an error

[Campbell Barton]

Revision: 31522
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31522
Author:   campbellbarton
Date:     2010-08-22 19:23:08 +0200 (Sun, 22 Aug 2010)

Log Message:
-----------
- rna py-api bug fix, a NULL item in a collection was raising an error
 eg: mesh.materials[0] 
 ... when this was an empty slot.

- game world mist panel wasnt updated for rna renaming.

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/properties_game.py
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/release/scripts/ui/properties_game.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_game.py	2010-08-22 16:55:58 UTC (rev 31521)
+++ trunk/blender/release/scripts/ui/properties_game.py	2010-08-22 17:23:08 UTC (rev 31522)
@@ -425,21 +425,21 @@
     def draw_header(self, context):
         world = context.world
 
-        self.layout.prop(world.mist, "use_mist", text="")
+        self.layout.prop(world.mist_settings, "use_mist", text="")
 
     def draw(self, context):
         layout = self.layout
 
         world = context.world
 
-        layout.active = world.mist.use_mist
+        layout.active = world.mist_settings.use_mist
         split = layout.split()
 
         col = split.column()
-        col.prop(world.mist, "start")
+        col.prop(world.mist_settings, "start")
 
         col = split.column()
-        col.prop(world.mist, "depth")
+        col.prop(world.mist_settings, "depth")
 
 
 class WORLD_PT_game_physics(WorldButtonsPanel, bpy.types.Panel):

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2010-08-22 16:55:58 UTC (rev 31521)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2010-08-22 17:23:08 UTC (rev 31522)
@@ -1250,10 +1250,11 @@
 		if(RNA_property_collection_lookup_int(&self->ptr, self->prop, keynum, &newptr)) {
 			return pyrna_struct_CreatePyObject(&newptr);
 		}
-		PyErr_Format(PyExc_IndexError, "bpy_prop_collection[index]: index %d could not be found", keynum);
-		return NULL;
+		else { /* fail's if ptr.data == NULL, valid for mesh.materials */
+			Py_RETURN_NONE;
+		}
 	}
-	PyErr_Format(PyExc_IndexError, "bpy_prop_collection[index]: index %d out of range", keynum);
+	PyErr_Format(PyExc_IndexError, "bpy_prop_collection[index]: index %d out of range, size %d", keynum, len);
 	return NULL;
 }