[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25553] trunk/blender: fix for [#20244] importing .obj without "Object" option checked crashes blender
Campbell Barton
ideasman42 at gmail.com
Fri Dec 25 21:40:00 CET 2009
Revision: 25553
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25553
Author: campbellbarton
Date: 2009-12-25 21:40:00 +0100 (Fri, 25 Dec 2009)
Log Message:
-----------
fix for [#20244] importing .obj without "Object" option checked crashes blender
Modified Paths:
--------------
trunk/blender/release/scripts/modules/rna_prop_ui.py
trunk/blender/source/blender/editors/mesh/mesh_data.c
Modified: trunk/blender/release/scripts/modules/rna_prop_ui.py
===================================================================
--- trunk/blender/release/scripts/modules/rna_prop_ui.py 2009-12-25 18:06:05 UTC (rev 25552)
+++ trunk/blender/release/scripts/modules/rna_prop_ui.py 2009-12-25 20:40:00 UTC (rev 25553)
@@ -143,7 +143,7 @@
class WM_OT_properties_edit(bpy.types.Operator):
'''Internal use (edit a property path)'''
bl_idname = "wm.properties_edit"
- bl_label = "Edit Property!"
+ bl_label = "Edit Property"
path = rna_path
property = rna_property
Modified: trunk/blender/source/blender/editors/mesh/mesh_data.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_data.c 2009-12-25 18:06:05 UTC (rev 25552)
+++ trunk/blender/source/blender/editors/mesh/mesh_data.c 2009-12-25 20:40:00 UTC (rev 25553)
@@ -676,7 +676,8 @@
me->mat = mat;
me->mat[me->totcol++] = ma;
- ma->id.us++;
+ if(ma)
+ ma->id.us++;
test_object_materials((ID*)me);
}
More information about the Bf-blender-cvs
mailing list