[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46436] trunk/blender/source/blender/ editors: style cleanup: graph & armature

Campbell Barton ideasman42 at gmail.com
Tue May 8 22:18:34 CEST 2012


Revision: 46436
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46436
Author:   campbellbarton
Date:     2012-05-08 20:18:33 +0000 (Tue, 08 May 2012)
Log Message:
-----------
style cleanup: graph & armature

Modified Paths:
--------------
    trunk/blender/source/blender/editors/animation/keyframing.c
    trunk/blender/source/blender/editors/armature/BIF_generate.h
    trunk/blender/source/blender/editors/armature/BIF_retarget.h
    trunk/blender/source/blender/editors/armature/armature_intern.h
    trunk/blender/source/blender/editors/armature/armature_ops.c
    trunk/blender/source/blender/editors/armature/editarmature.c
    trunk/blender/source/blender/editors/armature/editarmature_generate.c
    trunk/blender/source/blender/editors/armature/editarmature_retarget.c
    trunk/blender/source/blender/editors/armature/editarmature_sketch.c
    trunk/blender/source/blender/editors/armature/meshlaplacian.c
    trunk/blender/source/blender/editors/armature/meshlaplacian.h
    trunk/blender/source/blender/editors/armature/poseSlide.c
    trunk/blender/source/blender/editors/armature/poseUtils.c
    trunk/blender/source/blender/editors/armature/poselib.c
    trunk/blender/source/blender/editors/armature/poseobject.c
    trunk/blender/source/blender/editors/armature/reeb.c
    trunk/blender/source/blender/editors/armature/reeb.h
    trunk/blender/source/blender/editors/space_graph/graph_buttons.c
    trunk/blender/source/blender/editors/space_graph/graph_draw.c
    trunk/blender/source/blender/editors/space_graph/graph_edit.c
    trunk/blender/source/blender/editors/space_graph/graph_intern.h
    trunk/blender/source/blender/editors/space_graph/graph_ops.c
    trunk/blender/source/blender/editors/space_graph/graph_select.c
    trunk/blender/source/blender/editors/space_graph/graph_utils.c
    trunk/blender/source/blender/editors/space_graph/space_graph.c

Modified: trunk/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyframing.c	2012-05-08 19:57:56 UTC (rev 46435)
+++ trunk/blender/source/blender/editors/animation/keyframing.c	2012-05-08 20:18:33 UTC (rev 46436)
@@ -1353,7 +1353,7 @@
 	float cfra = (float)CFRA; // XXX for now, don't bother about all the yucky offset crap
 	
 	// XXX more comprehensive tests will be needed
-	CTX_DATA_BEGIN(C, Object *, ob, selected_objects)
+	CTX_DATA_BEGIN (C, Object *, ob, selected_objects)
 	{
 		ID *id = (ID *)ob;
 		FCurve *fcu, *fcn;

Modified: trunk/blender/source/blender/editors/armature/BIF_generate.h
===================================================================
--- trunk/blender/source/blender/editors/armature/BIF_generate.h	2012-05-08 19:57:56 UTC (rev 46435)
+++ trunk/blender/source/blender/editors/armature/BIF_generate.h	2012-05-08 20:18:33 UTC (rev 46436)
@@ -32,7 +32,7 @@
 struct bArmature;
 struct ListBase;
 
-typedef int(NextSubdivisionFunc)(struct ToolSettings*, struct BArcIterator*, int, int, float[3], float[3]);
+typedef int (NextSubdivisionFunc)(struct ToolSettings *, struct BArcIterator *, int, int, float[3], float[3]);
  
 float calcArcCorrelation(struct BArcIterator *iter, int start, int end, float v0[3], float n[3]);
 
@@ -40,7 +40,7 @@
 int nextLengthSubdivision(struct ToolSettings *toolsettings, struct BArcIterator *iter, int start, int end, float head[3], float p[3]);
 int nextAdaptativeSubdivision(struct ToolSettings *toolsettings, struct BArcIterator *iter, int start, int end, float head[3], float p[3]);
 
-struct EditBone * subdivideArcBy(struct ToolSettings *toolsettings, struct bArmature *arm, ListBase *editbones, struct BArcIterator *iter, float invmat[][4], float tmat[][3], NextSubdivisionFunc next_subdividion);
+struct EditBone *subdivideArcBy(struct ToolSettings *toolsettings, struct bArmature *arm, ListBase *editbones, struct BArcIterator *iter, float invmat[][4], float tmat[][3], NextSubdivisionFunc next_subdividion);
 
 void setBoneRollFromNormal(struct EditBone *bone, float *no, float invmat[][4], float tmat[][3]);
  

Modified: trunk/blender/source/blender/editors/armature/BIF_retarget.h
===================================================================
--- trunk/blender/source/blender/editors/armature/BIF_retarget.h	2012-05-08 19:57:56 UTC (rev 46435)
+++ trunk/blender/source/blender/editors/armature/BIF_retarget.h	2012-05-08 20:18:33 UTC (rev 46436)
@@ -22,7 +22,6 @@
  *  \ingroup edarmature
  */
 
-
 #ifndef __BIF_RETARGET_H__
 #define __BIF_RETARGET_H__
 
@@ -49,21 +48,21 @@
 #define USE_THREADS
 
 typedef struct RigGraph {
-	ListBase	arcs;
-	ListBase	nodes;
+	ListBase arcs;
+	ListBase nodes;
 
 	float length;
 	
-	FreeArc			free_arc;
-	FreeNode		free_node;
-	RadialSymmetry	radial_symmetry;
-	AxialSymmetry	axial_symmetry;
+	FreeArc         free_arc;
+	FreeNode        free_node;
+	RadialSymmetry  radial_symmetry;
+	AxialSymmetry   axial_symmetry;
 	/*********************************/
 	
-	int			flag;
+	int flag;
 
-	ListBase	controls;
-	ListBase*	editbones;
+	ListBase   controls;
+	ListBase  *editbones;
 	
 	struct RigNode *head;
 	ReebGraph *link_mesh;
@@ -71,8 +70,8 @@
 	
 	struct ThreadedWorker *worker;
 	
-	GHash *bones_map;	/* map of editbones by name */
-	GHash *controls_map;	/* map of rigcontrols by bone pointer */
+	GHash *bones_map;     /* map of editbones by name */
+	GHash *controls_map;  /* map of rigcontrols by bone pointer */
 	
 	struct Object *ob;
 } RigGraph;
@@ -123,16 +122,16 @@
 } RigEdge;
 
 /* Graph flags */
-#define	RIG_FREE_BONELIST		1
+#define RIG_FREE_BONELIST       1
 
 /* Control flags */
-#define RIG_CTRL_HEAD_DONE		1
-#define RIG_CTRL_TAIL_DONE		2
-#define RIG_CTRL_PARENT_DEFORM	4
-#define RIG_CTRL_FIT_ROOT		8
-#define RIG_CTRL_FIT_BONE		16
+#define RIG_CTRL_HEAD_DONE      1
+#define RIG_CTRL_TAIL_DONE      2
+#define RIG_CTRL_PARENT_DEFORM  4
+#define RIG_CTRL_FIT_ROOT       8
+#define RIG_CTRL_FIT_BONE       16
 
-#define RIG_CTRL_DONE	(RIG_CTRL_HEAD_DONE|RIG_CTRL_TAIL_DONE)
+#define RIG_CTRL_DONE   (RIG_CTRL_HEAD_DONE | RIG_CTRL_TAIL_DONE)
 
 /* Control tail flags */
 typedef enum {
@@ -147,10 +146,10 @@
 	struct EditBone *bone;
 	struct EditBone *link;
 	struct EditBone *link_tail;
-	float	up_axis[3];
-	float	offset[3];
-	float	qrot[4]; /* for dual linked bones, store the rotation of the linked bone for the finalization */
-	int		flag;
+	float  up_axis[3];
+	float  offset[3];
+	float  qrot[4];   /* for dual linked bones, store the rotation of the linked bone for the finalization */
+	int    flag;
 	LinkTailMode tail_mode;
 } RigControl;
 

Modified: trunk/blender/source/blender/editors/armature/armature_intern.h
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_intern.h	2012-05-08 19:57:56 UTC (rev 46435)
+++ trunk/blender/source/blender/editors/armature/armature_intern.h	2012-05-08 20:18:33 UTC (rev 46436)
@@ -150,19 +150,19 @@
 typedef struct tPChanFCurveLink {
 	struct tPChanFCurveLink *next, *prev;
 	
-	ListBase fcurves;				/* F-Curves for this PoseChannel (wrapped with LinkData) */
-	struct bPoseChannel *pchan;		/* Pose Channel which data is attached to */
+	ListBase fcurves;               /* F-Curves for this PoseChannel (wrapped with LinkData) */
+	struct bPoseChannel *pchan;     /* Pose Channel which data is attached to */
 	
-	char *pchan_path;				/* RNA Path to this Pose Channel (needs to be freed when we're done) */
+	char *pchan_path;               /* RNA Path to this Pose Channel (needs to be freed when we're done) */
 	
-	float oldloc[3];				/* transform values at start of operator (to be restored before each modal step) */
+	float oldloc[3];                /* transform values at start of operator (to be restored before each modal step) */
 	float oldrot[3];
 	float oldscale[3];
 	float oldquat[4];
 	float oldangle;
 	float oldaxis[3];
 	
-	struct IDProperty *oldprops;	/* copy of custom properties at start of operator (to be restored before each modal step) */	
+	struct IDProperty *oldprops;    /* copy of custom properties at start of operator (to be restored before each modal step) */
 } tPChanFCurveLink;
 
 /* ----------- */

Modified: trunk/blender/source/blender/editors/armature/armature_ops.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_ops.c	2012-05-08 19:57:56 UTC (rev 46435)
+++ trunk/blender/source/blender/editors/armature/armature_ops.c	2012-05-08 20:18:33 UTC (rev 46436)
@@ -174,7 +174,7 @@
 	
 	ot = WM_operatortype_append_macro("ARMATURE_OT_duplicate_move", "Duplicate",
 	                                  "Make copies of the selected bones within the same armature and move them",
-	                                  OPTYPE_UNDO|OPTYPE_REGISTER);
+	                                  OPTYPE_UNDO | OPTYPE_REGISTER);
 	if (ot) {
 		WM_operatortype_macro_define(ot, "ARMATURE_OT_duplicate");
 		otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
@@ -183,9 +183,9 @@
 
 	ot = WM_operatortype_append_macro("ARMATURE_OT_extrude_move", "Extrude",
 	                                  "Create new bones from the selected joints and move them",
-	                                  OPTYPE_UNDO|OPTYPE_REGISTER);
+	                                  OPTYPE_UNDO | OPTYPE_REGISTER);
 	if (ot) {
-		otmacro=WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude");
+		otmacro = WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude");
 		RNA_boolean_set(otmacro->ptr, "forked", FALSE);
 		otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
 		RNA_enum_set(otmacro->ptr, "proportional", 0);
@@ -195,9 +195,9 @@
 	// that would require fixing a properties bug 19733
 	ot = WM_operatortype_append_macro("ARMATURE_OT_extrude_forked", "Extrude Forked",
 	                                  "Create new bones from the selected joints and move them",
-	                                  OPTYPE_UNDO|OPTYPE_REGISTER);
+	                                  OPTYPE_UNDO | OPTYPE_REGISTER);
 	if (ot) {
-		otmacro=WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude");
+		otmacro = WM_operatortype_macro_define(ot, "ARMATURE_OT_extrude");
 		RNA_boolean_set(otmacro->ptr, "forked", TRUE);
 		otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
 		RNA_enum_set(otmacro->ptr, "proportional", 0);
@@ -237,7 +237,7 @@
 	RNA_boolean_set(kmi->ptr, "unselected", TRUE);
 
 	WM_keymap_add_item(keymap, "ARMATURE_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0);
-	WM_keymap_add_item(keymap, "ARMATURE_OT_align", AKEY, KM_PRESS, KM_CTRL|KM_ALT, 0);
+	WM_keymap_add_item(keymap, "ARMATURE_OT_align", AKEY, KM_PRESS, KM_CTRL | KM_ALT, 0);
 	WM_keymap_add_item(keymap, "ARMATURE_OT_calculate_roll", NKEY, KM_PRESS, KM_CTRL, 0);
 	
 	WM_keymap_add_item(keymap, "ARMATURE_OT_switch_direction", FKEY, KM_PRESS, KM_ALT, 0);
@@ -248,23 +248,23 @@
 	WM_keymap_add_item(keymap, "ARMATURE_OT_parent_clear", PKEY, KM_PRESS, KM_ALT, 0);
 	
 	kmi = WM_keymap_add_item(keymap, "ARMATURE_OT_select_all", AKEY, KM_PRESS, 0, 0);
-		RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
+	RNA_enum_set(kmi->ptr, "action", SEL_TOGGLE);
 	kmi = WM_keymap_add_item(keymap, "ARMATURE_OT_select_all", IKEY, KM_PRESS, KM_CTRL, 0);
-		RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
+	RNA_enum_set(kmi->ptr, "action", SEL_INVERT);
 	
 	kmi = WM_keymap_add_item(keymap, "ARMATURE_OT_select_hierarchy", LEFTBRACKETKEY, KM_PRESS, 0, 0);
-		RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_PARENT);
-		RNA_boolean_set(kmi->ptr, "extend", FALSE);
+	RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_PARENT);
+	RNA_boolean_set(kmi->ptr, "extend", FALSE);
 	kmi = WM_keymap_add_item(keymap, "ARMATURE_OT_select_hierarchy", LEFTBRACKETKEY, KM_PRESS, KM_SHIFT, 0);
-		RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_PARENT);
-		RNA_boolean_set(kmi->ptr, "extend", TRUE);
+	RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_PARENT);
+	RNA_boolean_set(kmi->ptr, "extend", TRUE);
 	
 	kmi = WM_keymap_add_item(keymap, "ARMATURE_OT_select_hierarchy", RIGHTBRACKETKEY, KM_PRESS, 0, 0);
-		RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_CHILD);
-		RNA_boolean_set(kmi->ptr, "extend", FALSE);
+	RNA_enum_set(kmi->ptr, "direction", BONE_SELECT_CHILD);
+	RNA_boolean_set(kmi->ptr, "extend", FALSE);

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list