diff options
-rw-r--r-- | release/scripts/ui/properties_game.py | 8 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/release/scripts/ui/properties_game.py b/release/scripts/ui/properties_game.py index 7735db8228c..8d2f075fce0 100644 --- a/release/scripts/ui/properties_game.py +++ b/release/scripts/ui/properties_game.py @@ -425,21 +425,21 @@ class WORLD_PT_game_mist(WorldButtonsPanel, bpy.types.Panel): 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): diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index fd3b59a97f7..07b237a40f8 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -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)) { 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; } |