[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41212] trunk/blender/source/blender/ editors: use defines for keying set names to avoid confusing them with text and having some incorrect names (as fixed in last commit)
Campbell Barton
ideasman42 at gmail.com
Sun Oct 23 07:08:04 CEST 2011
Revision: 41212
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41212
Author: campbellbarton
Date: 2011-10-23 05:08:02 +0000 (Sun, 23 Oct 2011)
Log Message:
-----------
use defines for keying set names to avoid confusing them with text and having some incorrect names (as fixed in last commit)
Modified Paths:
--------------
trunk/blender/source/blender/editors/animation/keyingsets.c
trunk/blender/source/blender/editors/armature/editarmature.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/include/ED_keyframing.h
trunk/blender/source/blender/editors/interface/interface_ops.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
Modified: trunk/blender/source/blender/editors/animation/keyingsets.c
===================================================================
--- trunk/blender/source/blender/editors/animation/keyingsets.c 2011-10-23 04:48:13 UTC (rev 41211)
+++ trunk/blender/source/blender/editors/animation/keyingsets.c 2011-10-23 05:08:02 UTC (rev 41212)
@@ -552,7 +552,12 @@
if (strcmp(name, ks->name) == 0)
return ks;
}
-
+
+ /* complain about missing keying sets on debug builds */
+#ifndef NDEBUG
+ printf("%s: '%s' not found\n", __func__, name);
+#endif
+
/* no matches found */
return NULL;
}
@@ -687,7 +692,7 @@
if (IS_AUTOKEY_FLAG(scene, ONLYKEYINGSET) && (scene->active_keyingset))
return ANIM_scene_get_active_keyingset(scene);
else if (IS_AUTOKEY_FLAG(scene, INSERTAVAIL))
- return ANIM_builtin_keyingset_get_named(NULL, "Available");
+ return ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_AVAILABLE_ID);
else
return ANIM_builtin_keyingset_get_named(NULL, tranformKSName);
}
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c 2011-10-23 04:48:13 UTC (rev 41211)
+++ trunk/blender/source/blender/editors/armature/editarmature.c 2011-10-23 05:08:02 UTC (rev 41212)
@@ -4948,7 +4948,7 @@
static int pose_clear_scale_exec(bContext *C, wmOperator *op)
{
- return pose_clear_transform_generic_exec(C, op, pchan_clear_scale, "Scaling");
+ return pose_clear_transform_generic_exec(C, op, pchan_clear_scale, ANIM_KS_SCALING_ID);
}
void POSE_OT_scale_clear(wmOperatorType *ot)
@@ -4969,7 +4969,7 @@
static int pose_clear_rot_exec(bContext *C, wmOperator *op)
{
- return pose_clear_transform_generic_exec(C, op, pchan_clear_rot, "Rotation");
+ return pose_clear_transform_generic_exec(C, op, pchan_clear_rot, ANIM_KS_ROTATION_ID);
}
void POSE_OT_rot_clear(wmOperatorType *ot)
@@ -4990,7 +4990,7 @@
static int pose_clear_loc_exec(bContext *C, wmOperator *op)
{
- return pose_clear_transform_generic_exec(C, op, pchan_clear_loc, "Location");
+ return pose_clear_transform_generic_exec(C, op, pchan_clear_loc, ANIM_KS_LOCATION_ID);
}
void POSE_OT_loc_clear(wmOperatorType *ot)
@@ -5011,7 +5011,7 @@
static int pose_clear_transforms_exec(bContext *C, wmOperator *op)
{
- return pose_clear_transform_generic_exec(C, op, pchan_clear_transforms, "LocRotScale");
+ return pose_clear_transform_generic_exec(C, op, pchan_clear_transforms, ANIM_KS_LOC_ROT_SCALE_ID);
}
void POSE_OT_transforms_clear(wmOperatorType *ot)
Modified: trunk/blender/source/blender/editors/armature/poseUtils.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseUtils.c 2011-10-23 04:48:13 UTC (rev 41211)
+++ trunk/blender/source/blender/editors/armature/poseUtils.c 2011-10-23 05:08:02 UTC (rev 41212)
@@ -223,7 +223,7 @@
{
/* insert keyframes as necessary if autokeyframing */
if (autokeyframe_cfra_can_key(scene, &ob->id)) {
- KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "Whole Character");
+ KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_WHOLE_CHARACTER_ID);
ListBase dsources = {NULL, NULL};
tPChanFCurveLink *pfl;
Modified: trunk/blender/source/blender/editors/armature/poselib.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poselib.c 2011-10-23 04:48:13 UTC (rev 41211)
+++ trunk/blender/source/blender/editors/armature/poselib.c 2011-10-23 05:08:02 UTC (rev 41212)
@@ -433,7 +433,7 @@
bAction *act = poselib_validate(ob);
bPose *pose= (ob) ? ob->pose : NULL;
TimeMarker *marker;
- KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Whole Character"); /* this includes custom props :)*/
+ KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_WHOLE_CHARACTER_ID); /* this includes custom props :)*/
int frame= RNA_int_get(op->ptr, "frame");
char name[64];
@@ -903,7 +903,7 @@
bAction *act= pld->act;
bActionGroup *agrp;
- KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "Whole Character");
+ KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_WHOLE_CHARACTER_ID);
ListBase dsources = {NULL, NULL};
short autokey = autokeyframe_cfra_can_key(scene, &pld->ob->id);
Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c 2011-10-23 04:48:13 UTC (rev 41211)
+++ trunk/blender/source/blender/editors/armature/poseobject.c 2011-10-23 05:08:02 UTC (rev 41212)
@@ -1151,7 +1151,7 @@
int selOnly= RNA_boolean_get(op->ptr, "selected_mask");
/* get KeyingSet to use */
- KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "LocRotScale");
+ KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_LOC_ROT_SCALE_ID);
/* sanity checks */
if ELEM(NULL, ob, ob->pose)
@@ -2165,7 +2165,7 @@
{
Scene *scene= CTX_data_scene(C);
Object *ob= object_pose_armature_get(CTX_data_active_object(C));
- KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, "LocRotScale");
+ KeyingSet *ks = ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOC_ROT_SCALE_ID);
/* loop through all selected pchans, flipping and keying (as needed) */
CTX_DATA_BEGIN(C, bPoseChannel*, pchan, selected_pose_bones)
Modified: trunk/blender/source/blender/editors/include/ED_keyframing.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_keyframing.h 2011-10-23 04:48:13 UTC (rev 41211)
+++ trunk/blender/source/blender/editors/include/ED_keyframing.h 2011-10-23 05:08:02 UTC (rev 41212)
@@ -317,6 +317,14 @@
int ED_autokeyframe_object(struct bContext *C, struct Scene *scene, struct Object *ob, struct KeyingSet *ks);
int ED_autokeyframe_pchan(struct bContext *C, struct Scene *scene, struct Object *ob, struct bPoseChannel *pchan, struct KeyingSet *ks);
+/* Names for builtin keying sets so we don't confuse these with labels/text,
+ * defined in python script: keyingsets_builtins.py */
+#define ANIM_KS_LOCATION_ID "Location"
+#define ANIM_KS_ROTATION_ID "Rotation"
+#define ANIM_KS_SCALING_ID "Scaling"
+#define ANIM_KS_LOC_ROT_SCALE_ID "LocRotScale"
+#define ANIM_KS_AVAILABLE_ID "Available"
+#define ANIM_KS_WHOLE_CHARACTER_ID "Whole Character"
#ifdef __cplusplus
}
Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c 2011-10-23 04:48:13 UTC (rev 41211)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c 2011-10-23 05:08:02 UTC (rev 41212)
@@ -648,10 +648,12 @@
ARegion *ar= CTX_wm_region(C);
int ret;
+ /* needed else the active button does not get tested */
uiFreeActiveButtons(C, CTX_wm_screen(C));
// printf("%s: begin\n", __func__);
+ /* take care not to return before calling ui_editsource_active_but_clear */
ui_editsource_active_but_set(but);
/* redraw and get active button python info */
Modified: trunk/blender/source/blender/editors/object/object_transform.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_transform.c 2011-10-23 04:48:13 UTC (rev 41211)
+++ trunk/blender/source/blender/editors/object/object_transform.c 2011-10-23 05:08:02 UTC (rev 41212)
@@ -252,7 +252,7 @@
static int object_location_clear_exec(bContext *C, wmOperator *op)
{
- return object_clear_transform_generic_exec(C, op, object_clear_loc, "Location");
+ return object_clear_transform_generic_exec(C, op, object_clear_loc, ANIM_KS_LOCATION_ID);
}
void OBJECT_OT_location_clear(wmOperatorType *ot)
@@ -272,7 +272,7 @@
static int object_rotation_clear_exec(bContext *C, wmOperator *op)
{
- return object_clear_transform_generic_exec(C, op, object_clear_rot, "Rotation");
+ return object_clear_transform_generic_exec(C, op, object_clear_rot, ANIM_KS_ROTATION_ID);
}
void OBJECT_OT_rotation_clear(wmOperatorType *ot)
@@ -292,7 +292,7 @@
static int object_scale_clear_exec(bContext *C, wmOperator *op)
{
- return object_clear_transform_generic_exec(C, op, object_clear_scale, "Scaling");
+ return object_clear_transform_generic_exec(C, op, object_clear_scale, ANIM_KS_SCALING_ID);
}
void OBJECT_OT_scale_clear(wmOperatorType *ot)
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_fly.c 2011-10-23 04:48:13 UTC (rev 41211)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_fly.c 2011-10-23 05:08:02 UTC (rev 41212)
@@ -699,11 +699,11 @@
* TODO: need to check in future that frame changed before doing this
*/
if (orientationChanged) {
- KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Rotation");
+ KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_ROTATION_ID);
ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA);
}
if (positionChanged) {
- KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, "Location");
+ KeyingSet *ks= ANIM_builtin_keyingset_get_named(NULL, ANIM_KS_LOCATION_ID);
ANIM_apply_keyingset(C, &dsources, NULL, ks, MODIFYKEY_MODE_INSERT, (float)CFRA);
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_snap.c 2011-10-23 04:48:13 UTC (rev 41211)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_snap.c 2011-10-23 05:08:02 UTC (rev 41212)
@@ -495,7 +495,7 @@
}
else {
- struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "Location");
+ struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_LOCATION_ID);
CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
if(ob->mode & OB_MODE_POSE) {
@@ -625,7 +625,7 @@
}
else {
- struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "Location");
+ struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, ANIM_KS_LOCATION_ID);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list