Revision: 53297
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53297
Author: mont29
Date: 2012-12-23 13:58:42 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
Add keying "options" parameter to keyframe_insert() bpy_rna function, so now
you can enable 'INSERTKEY_NEEDED', 'INSERTKEY_VISUAL' and/or
'INSERTKEY_XYZ_TO_RGB' when you directly key some property from python script
(previously those options were only available through keyingsets).
Thanks to Campbell for review!
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/RNA_enum_types.h
trunk/blender/source/blender/makesrna/intern/rna_animation.c
trunk/blender/source/blender/python/intern/bpy_rna_anim.c
Modified: trunk/blender/source/blender/makesrna/RNA_enum_types.h
===================================================================
--- trunk/blender/source/blender/makesrna/RNA_enum_types.h 2012-12-23
13:57:09 UTC (rev 53296)
+++ trunk/blender/source/blender/makesrna/RNA_enum_types.h 2012-12-23
13:58:42 UTC (rev 53297)
@@ -70,6 +70,7 @@
extern EnumPropertyItem keyblock_type_items[];
extern EnumPropertyItem keyingset_path_grouping_items[];
+extern EnumPropertyItem keying_flag_items[];
extern EnumPropertyItem keyframe_paste_offset_items[];
extern EnumPropertyItem keyframe_paste_merge_items[];
Modified: trunk/blender/source/blender/makesrna/intern/rna_animation.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_animation.c
2012-12-23 13:57:09 UTC (rev 53296)
+++ trunk/blender/source/blender/makesrna/intern/rna_animation.c
2012-12-23 13:58:42 UTC (rev 53297)
@@ -52,6 +52,20 @@
{0, NULL, 0, NULL, NULL}
};
+/* It would be cool to get rid of this 'INSERTKEY_' prefix in 'py strings'
values, but it would break existing
+ * exported keyingset... :/
+ */
+EnumPropertyItem keying_flag_items[] = {
+ {INSERTKEY_NEEDED, "INSERTKEY_NEEDED", 0, "Only Needed",
+ "Only insert keyframes where they're needed in the
relevant F-Curves"},
+ {INSERTKEY_MATRIX, "INSERTKEY_VISUAL", 0, "Visual Keying",
+ "Insert keyframes based on 'visual transforms'"},
+ {INSERTKEY_XYZ2RGB, "INSERTKEY_XYZ_TO_RGB", 0, "XYZ=RGB Colors",
+ "Color for newly added transformation F-Curves
(Location, Rotation, Scale) "
+ "and also Color is based on the transform axis"},
+ {0, NULL, 0, NULL, NULL}
+};
+
#ifdef RNA_RUNTIME
#include "BLI_math_base.h"
@@ -518,17 +532,6 @@
{
PropertyRNA *prop;
- static EnumPropertyItem keying_flag_items[] = {
- {INSERTKEY_NEEDED, "INSERTKEY_NEEDED", 0, "Only Needed",
- "Only insert keyframes where they're needed
in the relevant F-Curves"},
- {INSERTKEY_MATRIX, "INSERTKEY_VISUAL", 0, "Visual Keying",
- "Insert keyframes based on 'visual
transforms'"},
- {INSERTKEY_XYZ2RGB, "INSERTKEY_XYZ_TO_RGB", 0, "XYZ=RGB Colors",
- "Color for newly added transformation
F-Curves (Location, Rotation, Scale) "
- "and also Color is based on the transform
axis"},
- {0, NULL, 0, NULL, NULL}
- };
-
prop = RNA_def_property(srna, "bl_options", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "keyingflag");
RNA_def_property_enum_items(prop, keying_flag_items);
Modified: trunk/blender/source/blender/python/intern/bpy_rna_anim.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna_anim.c 2012-12-23
13:57:09 UTC (rev 53296)
+++ trunk/blender/source/blender/python/intern/bpy_rna_anim.c 2012-12-23
13:58:42 UTC (rev 53297)
@@ -44,6 +44,7 @@
#include "BKE_fcurve.h"
#include "RNA_access.h"
+#include "RNA_enum_types.h"
#include "WM_api.h"
#include "WM_types.h"
@@ -147,14 +148,17 @@
/* internal use for insert and delete */
static int pyrna_struct_keyframe_parse(
PointerRNA *ptr, PyObject *args, PyObject *kw, const char *parse_str,
const char *error_prefix,
- const char **path_full, int *index, float *cfra, const char
**group_name) /* return values */
+ const char **path_full, int *index, float *cfra, const char
**group_name, int *options) /* return values */
{
- static const char *kwlist[] = {"data_path", "index", "frame", "group",
NULL};
+ static const char *kwlist[] = {"data_path", "index", "frame", "group",
"options", NULL};
+ PyObject *pyoptions = NULL;
const char *path;
- /* note, parse_str MUST start with 's|ifs' */
- if (!PyArg_ParseTupleAndKeywords(args, kw, parse_str, (char **)kwlist,
&path, index, cfra, group_name))
+ /* note, parse_str MUST start with 's|ifsO!' */
+ if (!PyArg_ParseTupleAndKeywords(args, kw, parse_str, (char **)kwlist,
&path, index, cfra, group_name,
+ &PySet_Type, &pyoptions)) {
return -1;
+ }
if (pyrna_struct_anim_args_parse(ptr, error_prefix, path, path_full,
index) < 0)
return -1;
@@ -162,6 +166,13 @@
if (*cfra == FLT_MAX)
*cfra = CTX_data_scene(BPy_GetContext())->r.cfra;
+ /* flag may be null (no option currently for remove keyframes e.g.). */
+ if (pyrna_struct_anim_args_parse(ptr, error_prefix, path, path_full,
index) < 0)
+ return -1;
+
+ if (pyoptions && options &&
(pyrna_set_to_enum_bitfield(keying_flag_items, pyoptions, options,
error_prefix) < 0))
+ return -1;
+
return 0; /* success */
}
@@ -172,12 +183,19 @@
"\n"
" :arg data_path: path to the property to key, analogous to the fcurve's
data path.\n"
" :type data_path: string\n"
-" :arg index: array index of the property to key. Defaults to -1 which will
key all indices or a single channel if the property is not an array.\n"
+" :arg index: array index of the property to key. Defaults to -1 which will
key all indices or a single channel "
+ "if the property is not an array.\n"
" :type index: int\n"
" :arg frame: The frame on which the keyframe is inserted, defaulting to the
current frame.\n"
" :type frame: float\n"
" :arg group: The name of the group the F-Curve should be added to if it
doesn't exist yet.\n"
" :type group: str\n"
+" :arg options: Some optional flags:\n"
+" 'NEEDED': Only insert keyframes where they're needed in
the relevant F-Curves.\n"
+" 'VISUAL': Insert keyframes based on 'visual
transforms'.\n"
+" 'XYZ_TO_RGB': Color for newly added transformation
F-Curves (Location, Rotation, Scale) "
+ "and also Color is based on the transform
axis.\n"
+" :type flag: set\n"
" :return: Success of keyframe insertion.\n"
" :rtype: boolean\n"
;
@@ -188,12 +206,13 @@
int index = -1;
float cfra = FLT_MAX;
const char *group_name = NULL;
+ int options = 0;
PYRNA_STRUCT_CHECK_OBJ(self);
if (pyrna_struct_keyframe_parse(&self->ptr, args, kw,
- "s|ifs:bpy_struct.keyframe_insert()",
"bpy_struct.keyframe_insert()",
- &path_full, &index, &cfra, &group_name)
== -1)
+ "s|ifsO!:bpy_struct.keyframe_insert()",
"bpy_struct.keyframe_insert()",
+ &path_full, &index, &cfra, &group_name,
&options) == -1)
{
return NULL;
}
@@ -203,7 +222,7 @@
BKE_reports_init(&reports, RPT_STORE);
- result = insert_keyframe(&reports, (ID *)self->ptr.id.data,
NULL, group_name, path_full, index, cfra, 0);
+ result = insert_keyframe(&reports, (ID *)self->ptr.id.data,
NULL, group_name, path_full, index, cfra, options);
MEM_freeN((void *)path_full);
if (BPy_reports_to_error(&reports, PyExc_RuntimeError, TRUE) ==
-1)
@@ -240,9 +259,9 @@
PYRNA_STRUCT_CHECK_OBJ(self);
if (pyrna_struct_keyframe_parse(&self->ptr, args, kw,
- "s|ifs:bpy_struct.keyframe_delete()",
+ "s|ifsO!:bpy_struct.keyframe_delete()",
"bpy_struct.keyframe_insert()",
- &path_full, &index, &cfra, &group_name)
== -1)
+ &path_full, &index, &cfra, &group_name,
NULL) == -1)
{
return NULL;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
