Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- rna py-api bug fix, a NULL item in a collection was raising an error

Browse Source 
eg: mesh.materials[0] 
 ... when this was an empty slot.

- game world mist panel wasnt updated for rna renaming.
This commit is contained in:
Campbell Barton
2010-08-22 17:23:08 +00:00
parent e4700ba58b
commit a60f79daf7
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
release/scripts/ui/properties_game.py
View File

@@ -425,21 +425,21 @@ class WORLD_PT_game_mist(WorldButtonsPanel, bpy.types.Panel):
def draw_header(self, context): def draw_header(self, context):
world = context.world world = context.world
self.layout.prop(world.mist, "use_mist", text="") self.layout.prop(world.mist_settings, "use_mist", text="")
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
world = context.world world = context.world
layout.active = world.mist.use_mist layout.active = world.mist_settings.use_mist
split = layout.split() split = layout.split()
col = split.column() col = split.column()
col.prop(world.mist, "start") col.prop(world.mist_settings, "start")
col = split.column() col = split.column()
col.prop(world.mist, "depth") col.prop(world.mist_settings, "depth")
class WORLD_PT_game_physics(WorldButtonsPanel, bpy.types.Panel): class WORLD_PT_game_physics(WorldButtonsPanel, bpy.types.Panel):

7
source/blender/python/intern/bpy_rna.c
View File

@@ -1250,10 +1250,11 @@ static PyObject *pyrna_prop_collection_subscript_int(BPy_PropertyRNA *self, Py_s
if(RNA_property_collection_lookup_int(&self->ptr, self->prop, keynum, &newptr)) { if(RNA_property_collection_lookup_int(&self->ptr, self->prop, keynum, &newptr)) {
return pyrna_struct_CreatePyObject(&newptr); return pyrna_struct_CreatePyObject(&newptr);
} }
PyErr_Format(PyExc_IndexError, "bpy_prop_collection[index]: index %d could not be found", keynum); else { /* fail's if ptr.data == NULL, valid for mesh.materials */
return NULL; 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; return NULL;
} }