[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28319] trunk/blender/source/blender/ editors/object/object_edit.c: bugfix [#22091] Crashing on Add Shortcut
Campbell Barton
ideasman42 at gmail.com
Wed Apr 21 09:56:34 CEST 2010
Revision: 28319
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28319
Author: campbellbarton
Date: 2010-04-21 09:56:34 +0200 (Wed, 21 Apr 2010)
Log Message:
-----------
bugfix [#22091] Crashing on Add Shortcut
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_edit.c
Modified: trunk/blender/source/blender/editors/object/object_edit.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_edit.c 2010-04-21 07:49:06 UTC (rev 28318)
+++ trunk/blender/source/blender/editors/object/object_edit.c 2010-04-21 07:56:34 UTC (rev 28319)
@@ -119,11 +119,15 @@
static void error_libdata() {}
-/* find the correct active object per context */
+/* find the correct active object per context
+ * note: context can be NULL when called from a enum with PROP_ENUM_NO_CONTEXT */
Object *ED_object_active_context(bContext *C)
{
- Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
- if (!ob) ob= CTX_data_active_object(C);
+ Object *ob= NULL;
+ if(C) {
+ ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+ if (!ob) ob= CTX_data_active_object(C);
+ }
return ob;
}
More information about the Bf-blender-cvs
mailing list