diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-08 02:28:20 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-08 02:37:43 +0300 |
commit | 91a155833e59275089641b63ae9271672ac17713 (patch) | |
tree | 8057253d80b84de168b96f45ae5e5063d6e8f0fa /source/blender/editors/armature | |
parent | 3d2ff33c261593d5211456500e8a212fb6a2ce82 (diff) |
Cleanup: comments causing bad clang-format output
Diffstat (limited to 'source/blender/editors/armature')
-rw-r--r-- | source/blender/editors/armature/armature_intern.h | 24 | ||||
-rw-r--r-- | source/blender/editors/armature/pose_edit.c | 21 | ||||
-rw-r--r-- | source/blender/editors/armature/pose_lib.c | 63 |
3 files changed, 71 insertions, 37 deletions
diff --git a/source/blender/editors/armature/armature_intern.h b/source/blender/editors/armature/armature_intern.h index da24787fc18..0f4fc4832b8 100644 --- a/source/blender/editors/armature/armature_intern.h +++ b/source/blender/editors/armature/armature_intern.h @@ -147,27 +147,35 @@ void POSE_OT_bone_layers(struct wmOperatorType *ot); typedef struct tPChanFCurveLink { struct tPChanFCurveLink *next, *prev; - struct Object *ob; /* Object this Pose Channel belongs to. */ + /** Object this Pose Channel belongs to. */ + struct Object *ob; - ListBase fcurves; /* F-Curves for this PoseChannel (wrapped with LinkData) */ - struct bPoseChannel *pchan; /* Pose Channel which data is attached to */ + /** F-Curves for this PoseChannel (wrapped with LinkData) */ + ListBase fcurves; + /** Pose Channel which data is attached to */ + struct bPoseChannel *pchan; - char *pchan_path; /* RNA Path to this Pose Channel (needs to be freed when we're done) */ + /** RNA Path to this Pose Channel (needs to be freed when we're done) */ + char *pchan_path; - float oldloc[3]; /* transform values at start of operator (to be restored before each modal step) */ + /** transform values at start of operator (to be restored before each modal step) */ + float oldloc[3]; float oldrot[3]; float oldscale[3]; float oldquat[4]; float oldangle; float oldaxis[3]; - float roll1, roll2; /* old bbone values (to be restored along with the transform properties) */ - float curveInX, curveInY; /* (NOTE: we haven't renamed these this time, as their names are already long enough) */ + /** old bbone values (to be restored along with the transform properties) */ + float roll1, roll2; + /** (NOTE: we haven't renamed these this time, as their names are already long enough) */ + float curveInX, curveInY; float curveOutX, curveOutY; float ease1, ease2; float scaleIn, scaleOut; - struct IDProperty *oldprops; /* copy of custom properties at start of operator (to be restored before each modal step) */ + /** copy of custom properties at start of operator (to be restored before each modal step) */ + struct IDProperty *oldprops; } tPChanFCurveLink; /* ----------- */ diff --git a/source/blender/editors/armature/pose_edit.c b/source/blender/editors/armature/pose_edit.c index 4b069deefa3..4014d7e9728 100644 --- a/source/blender/editors/armature/pose_edit.c +++ b/source/blender/editors/armature/pose_edit.c @@ -926,7 +926,8 @@ static int pose_armature_layers_showall_exec(bContext *C, wmOperator *op) bArmature *arm = armature_layers_get_data(&ob); PointerRNA ptr; int maxLayers = (RNA_boolean_get(op->ptr, "all")) ? 32 : 16; - bool layers[32] = {false}; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + bool layers[32] = {false}; int i; /* sanity checking */ @@ -978,7 +979,8 @@ static int armature_layers_invoke(bContext *C, wmOperator *op, const wmEvent *ev Object *ob = CTX_data_active_object(C); bArmature *arm = armature_layers_get_data(&ob); PointerRNA ptr; - bool layers[32]; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + bool layers[32]; /* sanity checking */ if (arm == NULL) @@ -999,7 +1001,8 @@ static int armature_layers_exec(bContext *C, wmOperator *op) Object *ob = CTX_data_active_object(C); bArmature *arm = armature_layers_get_data(&ob); PointerRNA ptr; - bool layers[32]; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + bool layers[32]; if (arm == NULL) { return OPERATOR_CANCELLED; @@ -1043,7 +1046,8 @@ void ARMATURE_OT_armature_layers(wmOperatorType *ot) /* Present a popup to get the layers that should be used */ static int pose_bone_layers_invoke(bContext *C, wmOperator *op, const wmEvent *event) { - bool layers[32] = {0}; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + bool layers[32] = {0}; /* get layers that are active already */ CTX_DATA_BEGIN (C, bPoseChannel *, pchan, selected_pose_bones) @@ -1068,7 +1072,8 @@ static int pose_bone_layers_invoke(bContext *C, wmOperator *op, const wmEvent *e static int pose_bone_layers_exec(bContext *C, wmOperator *op) { PointerRNA ptr; - bool layers[32]; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + bool layers[32]; /* get the values set in the operator properties */ RNA_boolean_get_array(op->ptr, "layers", layers); @@ -1117,7 +1122,8 @@ void POSE_OT_bone_layers(wmOperatorType *ot) /* Present a popup to get the layers that should be used */ static int armature_bone_layers_invoke(bContext *C, wmOperator *op, const wmEvent *event) { - bool layers[32] = {0}; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + bool layers[32] = {0}; /* get layers that are active already */ CTX_DATA_BEGIN (C, EditBone *, ebone, selected_editable_bones) @@ -1145,7 +1151,8 @@ static int armature_bone_layers_exec(bContext *C, wmOperator *op) { Object *ob = CTX_data_edit_object(C); PointerRNA ptr; - bool layers[32]; /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + /* hardcoded for now - we can only have 32 armature layers, so this should be fine... */ + bool layers[32]; /* get the values set in the operator properties */ RNA_boolean_get_array(op->ptr, "layers", layers); diff --git a/source/blender/editors/armature/pose_lib.c b/source/blender/editors/armature/pose_lib.c index 14706f89607..c8ce0774208 100644 --- a/source/blender/editors/armature/pose_lib.c +++ b/source/blender/editors/armature/pose_lib.c @@ -825,30 +825,49 @@ void POSELIB_OT_pose_move(wmOperatorType *ot) /* Simple struct for storing settings/data for use during PoseLib preview */ typedef struct tPoseLib_PreviewData { - ListBase backups; /* tPoseLib_Backup structs for restoring poses */ - ListBase searchp; /* LinkData structs storing list of poses which match the current search-string */ - - Scene *scene; /* active scene */ - ScrArea *sa; /* active area */ - - PointerRNA rna_ptr; /* RNA-Pointer to Object 'ob' */ - Object *ob; /* object to work on */ - bArmature *arm; /* object's armature data */ - bPose *pose; /* object's pose */ - bAction *act; /* poselib to use */ - TimeMarker *marker; /* 'active' pose */ - - int totcount; /* total number of elements to work on */ - - short state; /* state of main loop */ - short redraw; /* redraw/update settings during main loop */ - short flag; /* flags for various settings */ + /** tPoseLib_Backup structs for restoring poses. */ + ListBase backups; + /** LinkData structs storing list of poses which match the current search-string. */ + ListBase searchp; + + /** active scene. */ + Scene *scene; + /** active area. */ + ScrArea *sa; - short search_cursor; /* position of cursor in searchstr (cursor occurs before the item at the nominated index) */ - char searchstr[64]; /* (Part of) Name to search for to filter poses that get shown */ - char searchold[64]; /* Previously set searchstr (from last loop run), so that we can detected when to rebuild searchp */ + /** RNA-Pointer to Object 'ob' .*/ + PointerRNA rna_ptr; + /** object to work on. */ + Object *ob; + /** object's armature data. */ + bArmature *arm; + /** object's pose. */ + bPose *pose; + /** poselib to use. */ + bAction *act; + /** 'active' pose. */ + TimeMarker *marker; - char headerstr[UI_MAX_DRAW_STR]; /* Info-text to print in header */ + /** total number of elements to work on. */ + int totcount; + + /** state of main loop. */ + short state; + /** redraw/update settings during main loop. */ + short redraw; + /** flags for various settings. */ + short flag; + + /** position of cursor in searchstr (cursor occurs before the item at the nominated index) */ + short search_cursor; + /** (Part of) Name to search for to filter poses that get shown. */ + char searchstr[64]; + /** Previously set searchstr (from last loop run), + * so that we can detected when to rebuild searchp. */ + char searchold[64]; + + /** Info-text to print in header. */ + char headerstr[UI_MAX_DRAW_STR]; } tPoseLib_PreviewData; /* defines for tPoseLib_PreviewData->state values */ |