[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13348] trunk/blender/source/blender: * Menus for Bone-Groups

[Joshua Leung]

Revision: 13348
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13348
Author:   aligorith
Date:     2008-01-22 04:35:14 +0100 (Tue, 22 Jan 2008)

Log Message:
-----------
* Menus for Bone-Groups
* Added missing #include in poseobject.c 

Modified Paths:
--------------
    trunk/blender/source/blender/include/BIF_poseobject.h
    trunk/blender/source/blender/src/header_view3d.c
    trunk/blender/source/blender/src/poseobject.c
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/include/BIF_poseobject.h
===================================================================
--- trunk/blender/source/blender/include/BIF_poseobject.h	2008-01-22 03:16:48 UTC (rev 13347)
+++ trunk/blender/source/blender/include/BIF_poseobject.h	2008-01-22 03:35:14 UTC (rev 13348)
@@ -65,7 +65,7 @@
 void pose_remove_posegroup(void);
 char *build_posegroups_menustr(struct bPose *pose, short for_pupmenu);
 void pose_assign_to_posegroup(void);
-void pose_remove_from_posegroup(void);
+void pose_remove_from_posegroups(void);
 void pgroup_operation_with_menu(void);
 
 void pose_calculate_path(struct Object *ob);

Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c	2008-01-22 03:16:48 UTC (rev 13347)
+++ trunk/blender/source/blender/src/header_view3d.c	2008-01-22 03:35:14 UTC (rev 13348)
@@ -4044,6 +4044,42 @@
 	return block;
 }
 
+static void do_view3d_pose_armature_groupmenu(void *arg, int event)
+{
+	switch (event) {
+		case 1:
+			pose_assign_to_posegroup();
+			break;
+		case 2:
+			pose_add_posegroup();
+			break;
+		case 3:
+			pose_remove_from_posegroups();
+			break;
+		case 4:
+			pose_remove_posegroup();
+			break;
+	}
+}
+
+static uiBlock *view3d_pose_armature_groupmenu(void *arg_unused)
+{
+	uiBlock *block;
+	short yco = 20, menuwidth = 120;
+	
+	block= uiNewBlock(&curarea->uiblocks, "view3d_pose_armature_groupmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
+	uiBlockSetButmFunc(block, do_view3d_pose_armature_groupmenu, NULL);
+	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add Selected to Group|Ctrl G, 1",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add New Group|Ctrl G, 2",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Remove from All Groups|Ctrl G, 3",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Remove Active Group|Ctrl G, 4",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
+	
+	uiBlockSetDirection(block, UI_RIGHT);
+	uiTextBoundsBlock(block, 60);
+	return block;
+}
+
 static void do_view3d_pose_armature_motionpathsmenu(void *arg, int event)
 {
 	
@@ -4198,6 +4234,8 @@
 	
 	uiDefIconTextBlockBut(block, view3d_pose_armature_poselibmenu, NULL, ICON_RIGHTARROW_THIN, "Pose Library", 0, yco-=20, 120, 19, "");
 	uiDefIconTextBlockBut(block, view3d_pose_armature_motionpathsmenu, NULL, ICON_RIGHTARROW_THIN, "Motion Paths", 0, yco-=20, 120, 19, "");
+	uiDefIconTextBlockBut(block, view3d_pose_armature_groupmenu, NULL, ICON_RIGHTARROW_THIN, "Bone Groups", 0, yco-=20, 120, 19, "");
+	uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	uiDefIconTextBlockBut(block, view3d_pose_armature_ikmenu, NULL, ICON_RIGHTARROW_THIN, "Inverse Kinematics", 0, yco-=20, 120, 19, "");
 	uiDefIconTextBlockBut(block, view3d_pose_armature_constraintsmenu, NULL, ICON_RIGHTARROW_THIN, "Constraints", 0, yco-=20, 120, 19, "");
 	

Modified: trunk/blender/source/blender/src/poseobject.c
===================================================================
--- trunk/blender/source/blender/src/poseobject.c	2008-01-22 03:16:48 UTC (rev 13347)
+++ trunk/blender/source/blender/src/poseobject.c	2008-01-22 03:35:14 UTC (rev 13348)
@@ -27,6 +27,7 @@
  */
 
 #include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 
 #include "MEM_guardedalloc.h"

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2008-01-22 03:16:48 UTC (rev 13347)
+++ trunk/blender/source/blender/src/space.c	2008-01-22 03:35:14 UTC (rev 13348)
@@ -1955,7 +1955,10 @@
 					if(G.obedit) {
 						if(G.obedit->type==OB_MESH)
 							select_mesh_group_menu();
-					} else
+					} 
+					else if(ob && (ob->flag & OB_POSEMODE))
+						puts("Shift-G menu for PoseMode - Not Implemented!");
+					else
 						select_object_grouped_menu();
 				else if((G.obedit==0) && G.qual==LR_ALTKEY) {
 					if(okee("Clear location")) {