[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24253] trunk/blender/source/blender/ editors: - "selected_pchans" is now at screen level context ( not just view3d) so can use for adding bones to a group.

[Campbell Barton]

Revision: 24253
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24253
Author:   campbellbarton
Date:     2009-11-02 18:24:06 +0100 (Mon, 02 Nov 2009)

Log Message:
-----------
- "selected_pchans" is now at screen level context (not just view3d) so can use for adding bones to a group.
- separate assign to Y key rather then Ctrl+4

Modified Paths:
--------------
    trunk/blender/source/blender/editors/armature/poseobject.c
    trunk/blender/source/blender/editors/mesh/mesh_ops.c

Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c	2009-11-02 17:22:59 UTC (rev 24252)
+++ trunk/blender/source/blender/editors/armature/poseobject.c	2009-11-02 17:24:06 UTC (rev 24253)
@@ -1310,7 +1310,6 @@
 	Object *ob;
 	bArmature *arm;
 	bPose *pose;
-	bPoseChannel *pchan;
 	short done= 0;
 	
 	/* since this call may also be used from the buttons window, we need to check for where to get the object */
@@ -1334,18 +1333,12 @@
 	
 	/* add selected bones to group then */
 	// NOTE: unfortunately, we cannot use the context-iterators here, since they might not be defined...
-	// CTX_DATA_BEGIN(C, bPoseChannel*, pchan, selected_pchans) 
-	for (pchan= pose->chanbase.first; pchan; pchan= pchan->next) {
-		/* ensure that PoseChannel is on visible layer and is not hidden in PoseMode */
-		// NOTE: sync this view3d_context() in space_view3d.c
-		if ((pchan->bone) && (arm->layer & pchan->bone->layer) && !(pchan->bone->flag & BONE_HIDDEN_P)) {
-			if (pchan->bone->flag & (BONE_SELECTED|BONE_ACTIVE)) {
-				pchan->agrp_index= pose->active_group;
-				done= 1;
-			}
-		}
+	CTX_DATA_BEGIN(C, bPoseChannel*, pchan, selected_pchans) {
+		pchan->agrp_index= pose->active_group;
+		done= 1;
 	}
-	
+	CTX_DATA_END;
+
 	/* notifiers for updates */
 	WM_event_add_notifier(C, NC_OBJECT|ND_POSE, ob);
 	

Modified: trunk/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/mesh_ops.c	2009-11-02 17:22:59 UTC (rev 24252)
+++ trunk/blender/source/blender/editors/mesh/mesh_ops.c	2009-11-02 17:24:06 UTC (rev 24253)
@@ -240,8 +240,7 @@
 	WM_keymap_add_item(keymap, "MESH_OT_quads_convert_to_tris", TKEY, KM_PRESS, KM_CTRL, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_tris_convert_to_quads", JKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_edge_flip", FKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0);
-	
-	WM_keymap_add_item(keymap, "MESH_OT_split", FOURKEY, KM_PRESS, KM_CTRL, 0);
+
 	WM_keymap_add_item(keymap, "MESH_OT_extrude_repeat", FOURKEY, KM_PRESS, KM_ALT, 0);
 	WM_keymap_add_item(keymap, "MESH_OT_edge_rotate", FIVEKEY, KM_PRESS, KM_CTRL, 0);
 	
@@ -265,6 +264,7 @@
 	RNA_string_set(kmi->ptr, "name", "INFO_MT_mesh_add");
 	
 	WM_keymap_add_item(keymap, "MESH_OT_separate", PKEY, KM_PRESS, 0, 0);
+	WM_keymap_add_item(keymap, "MESH_OT_split", YKEY, KM_PRESS, 0, 0);
 						/* use KM_RELEASE because same key is used for tweaks
 						 * TEMPORARY REMAP TO ALT+CTRL TO AVOID CONFLICT 
 						 * */