[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25429] trunk/blender/source/blender/ editors/object/object_select.c: Fix [#20414] select children (shift+g) on an object without children...

Matt Ebb matt at mke3.net
Thu Dec 17 08:40:44 CET 2009


Revision: 25429
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25429
Author:   broken
Date:     2009-12-17 08:40:43 +0100 (Thu, 17 Dec 2009)

Log Message:
-----------
Fix [#20414] select children (shift+g) on an object without children...

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

Modified: trunk/blender/source/blender/editors/object/object_select.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_select.c	2009-12-17 06:06:30 UTC (rev 25428)
+++ trunk/blender/source/blender/editors/object/object_select.c	2009-12-17 07:40:43 UTC (rev 25429)
@@ -571,6 +571,7 @@
 	if (extend == 0) {
 		CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
 			ED_base_object_select(base, BA_DESELECT);
+			changed = 1;
 		}
 		CTX_DATA_END;
 	}
@@ -581,17 +582,17 @@
 		return OPERATOR_CANCELLED;
 	}
 	
-	if(nr==1)		changed = select_grouped_children(C, ob, 1);
-	else if(nr==2)	changed = select_grouped_children(C, ob, 0);
-	else if(nr==3)	changed = select_grouped_parent(C);
-	else if(nr==4)	changed = select_grouped_siblings(C, ob);
-	else if(nr==5)	changed = select_grouped_type(C, ob);
-	else if(nr==6)	changed = select_grouped_layer(C, ob);
-	else if(nr==7)	changed = select_grouped_group(C, ob);
-	else if(nr==8)	changed = select_grouped_object_hooks(C, ob);
-	else if(nr==9)	changed = select_grouped_index_object(C, ob);
-	else if(nr==10)	changed = select_grouped_color(C, ob);
-	else if(nr==11)	changed = select_grouped_gameprops(C, ob);
+	if(nr==1)		changed |= select_grouped_children(C, ob, 1);
+	else if(nr==2)	changed |= select_grouped_children(C, ob, 0);
+	else if(nr==3)	changed |= select_grouped_parent(C);
+	else if(nr==4)	changed |= select_grouped_siblings(C, ob);
+	else if(nr==5)	changed |= select_grouped_type(C, ob);
+	else if(nr==6)	changed |= select_grouped_layer(C, ob);
+	else if(nr==7)	changed |= select_grouped_group(C, ob);
+	else if(nr==8)	changed |= select_grouped_object_hooks(C, ob);
+	else if(nr==9)	changed |= select_grouped_index_object(C, ob);
+	else if(nr==10)	changed |= select_grouped_color(C, ob);
+	else if(nr==11)	changed |= select_grouped_gameprops(C, ob);
 	
 	if (changed) {
 		WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT, CTX_data_scene(C));





More information about the Bf-blender-cvs mailing list