[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48501] trunk/blender/source/blender/ editors/object/object_group.c: fix for crash getting GROUP_OT_objects_remove's props without a context ( own fault)

Campbell Barton ideasman42 at gmail.com
Mon Jul 2 19:12:43 CEST 2012


Revision: 48501
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48501
Author:   campbellbarton
Date:     2012-07-02 17:12:41 +0000 (Mon, 02 Jul 2012)
Log Message:
-----------
fix for crash getting GROUP_OT_objects_remove's props without a context (own fault)

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_group.c

Modified: trunk/blender/source/blender/editors/object/object_group.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_group.c	2012-07-02 17:02:10 UTC (rev 48500)
+++ trunk/blender/source/blender/editors/object/object_group.c	2012-07-02 17:12:41 UTC (rev 48501)
@@ -237,7 +237,7 @@
 /* can be called with C == NULL */
 static EnumPropertyItem *group_objects_remove_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), int *free)
 {
-	Object *ob = ED_object_context(C);
+	Object *ob;
 	EnumPropertyItem *item = NULL, item_tmp = {0};
 	int totitem = 0;
 
@@ -245,6 +245,8 @@
 		return DummyRNA_NULL_items;
 	}
 
+	ob = ED_object_context(C);
+
 	/* check that the action exists */
 	if (ob) {
 		Group *group = NULL;




More information about the Bf-blender-cvs mailing list