[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25183] trunk/blender/source/blender/ blenkernel/intern/group.c: missing null check from recent changes

Campbell Barton ideasman42 at gmail.com
Mon Dec 7 20:49:14 CET 2009


Revision: 25183
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25183
Author:   campbellbarton
Date:     2009-12-07 20:49:14 +0100 (Mon, 07 Dec 2009)

Log Message:
-----------
missing null check from recent changes

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/group.c

Modified: trunk/blender/source/blender/blenkernel/intern/group.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/group.c	2009-12-07 19:26:34 UTC (rev 25182)
+++ trunk/blender/source/blender/blenkernel/intern/group.c	2009-12-07 19:49:14 UTC (rev 25183)
@@ -217,8 +217,8 @@
 int rem_from_group(Group *group, Object *object, Scene *scene, Base *base)
 {
 	if(rem_from_group_internal(group, object)) {
-
-		if(find_group(object, NULL) == NULL) {
+		/* object can be NULL */
+		if(object && find_group(object, NULL) == NULL) {
 			if(scene && base==NULL)
 				base= object_in_scene(object, scene);
 





More information about the Bf-blender-cvs mailing list