Bug fix #2260

"Select group, Parent" menu crashed when parent was in other scene.
Simply added extra check in code.

1 files changed, 11 insertions, 8 deletions

diff --git a/source/blender/src/space.c b/source/blender/src/space.c
index 6cd90134a86..0ec8b143353 100644
--- a/source/blender/src/space.c
+++ b/source/blender/src/space.c
@@ -555,16 +555,19 @@ void select_parent(void)	/* Makes parent active and de-selected OBACT */
 	while(base) {
 		if(base->object==BASACT->object->parent) { basact=base; break; }
 		base=base->next;
-		if(base==0) base= FIRSTBASE;
+		if(base==NULL) base= FIRSTBASE;
 		if(base==startbase) break;
 	}
-	oldbasact = BASACT;
-	BASACT = basact;
-	basact->flag |= SELECT;		
-	
-	basact->object->flag= basact->flag;
-	
-	set_active_base(basact);
+	/* can be NULL if parent in other scene */
+	if(basact) {
+		oldbasact = BASACT;
+		BASACT = basact;
+		basact->flag |= SELECT;		
+		
+		basact->object->flag= basact->flag;
+		
+		set_active_base(basact);
+	}
 }