Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2009-04-08 16:01:23 +0400
committerJoshua Leung <aligorith@gmail.com>2009-04-08 16:01:23 +0400
commit0f4a07afb9b97e3c929caf9812cc78108a9937fd (patch)
treec9e8181ddd8cec023c09d3bf0c97b0b77c448be9 /source
parentad2c860baf3708243349d10fe96ecf7c1efc7897 (diff)
Builtin KeyingSets Bugfix:
* Builtin KeyingSet for Scale works now. Was using the wrong RNA-paths * Added LocRotScale builtin KeyingSet
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/animation/keyframing.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c
index f0813a7e59d..34af48b4c63 100644
--- a/source/blender/editors/animation/keyframing.c
+++ b/source/blender/editors/animation/keyframing.c
@@ -1659,7 +1659,7 @@ static bBuiltinKeyingSet def_builtin_keyingsets_v3d[] =
/* Path Definitions */
BI_KS_PATHS_BEGIN(1)
- BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN, "scaling", 0, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_KSNAME)
+ BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN, "scale", 0, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_KSNAME)
BI_KS_PATHS_END
},
@@ -1674,6 +1674,19 @@ static bBuiltinKeyingSet def_builtin_keyingsets_v3d[] =
BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN, "location", 0, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_KSNAME),
BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN, "rotation", 0, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_KSNAME)
BI_KS_PATHS_END
+ },
+
+ /* Keying Set - "LocRotScale" ---------- */
+ {
+ /* KeyingSet Definition */
+ BI_KS_DEFINE("LocRotScale", 0),
+
+ /* Path Definitions */
+ BI_KS_PATHS_BEGIN(2)
+ BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN, "location", 0, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_KSNAME),
+ BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN, "rotation", 0, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_KSNAME),
+ BI_KSP_DEFINE(ID_OB, KSP_TEMPLATE_OBJECT|KSP_TEMPLATE_PCHAN, "scale", 0, KSP_FLAG_WHOLE_ARRAY, KSP_GROUP_KSNAME)
+ BI_KS_PATHS_END
}
};