[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18987] branches/blender2.5/blender/source /blender: 2.5
Joshua Leung
aligorith at gmail.com
Mon Feb 16 00:28:30 CET 2009
Revision: 18987
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18987
Author: aligorith
Date: 2009-02-16 00:28:30 +0100 (Mon, 16 Feb 2009)
Log Message:
-----------
2.5
Added RNA wrapping for F-Curve colour settings
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
branches/blender2.5/blender/source/blender/python/BPY_extern.h
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c 2009-02-15 23:26:00 UTC (rev 18986)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c 2009-02-15 23:28:30 UTC (rev 18987)
@@ -622,8 +622,7 @@
/* this evaluates the expression using Python,and returns its result:
* - on errors it reports, then returns 0.0f
*/
- //return BPY_pydriver_eval(driver); // XXX old func
- return 1.0f;
+ return BPY_pydriver_eval(driver);
#endif /* DISABLE_PYTHON*/
}
break;
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c 2009-02-15 23:26:00 UTC (rev 18986)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c 2009-02-15 23:28:30 UTC (rev 18987)
@@ -157,6 +157,11 @@
{FCURVE_EXTRAPOLATE_CONSTANT, "CONSTANT", "Constant", ""},
{FCURVE_EXTRAPOLATE_LINEAR, "LINEAR", "Linear", ""},
{0, NULL, NULL, NULL}};
+ static EnumPropertyItem prop_mode_color_items[] = {
+ {FCURVE_COLOR_AUTO_RAINBOW, "AUTO_RAINBOW", "Automatic Rainbow", ""},
+ {FCURVE_COLOR_AUTO_RGB, "AUTO_RGB", "Automatic XYZ to RGB", ""},
+ {FCURVE_COLOR_CUSTOM, "CUSTOM", "User Defined", ""},
+ {0, NULL, NULL, NULL}};
srna= RNA_def_struct(brna, "FCurve", NULL);
RNA_def_struct_ui_text(srna, "F-Curve", "F-Curve defining values of a period of time.");
@@ -164,14 +169,13 @@
/* Enums */
prop= RNA_def_property(srna, "extrapolation", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "extend");
- RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
RNA_def_property_enum_items(prop, prop_mode_extend_items);
RNA_def_property_ui_text(prop, "Extrapolation", "");
/* Pointers */
- //prop= RNA_def_property(srna, "object", PROP_POINTER, PROP_NONE);
- //RNA_def_property_pointer_sdna(prop, NULL, "driver");
- //RNA_def_property_ui_text(prop, "Driver", "");
+ prop= RNA_def_property(srna, "driver", PROP_POINTER, PROP_NONE);
+ RNA_def_property_flag(prop, PROP_NOT_EDITABLE); // xxx?
+ RNA_def_property_ui_text(prop, "Driver", "Channel Driver (only set for Driver F-Curves)");
/* Path + Array Index */
prop= RNA_def_property(srna, "rna_path", PROP_STRING, PROP_NONE);
@@ -181,7 +185,16 @@
prop= RNA_def_property(srna, "array_index", PROP_INT, PROP_NONE);
RNA_def_property_ui_text(prop, "RNA Array Index", "Index to the specific property affected by F-Curve if applicable.");
-
+
+ /* Color */
+ prop= RNA_def_property(srna, "color_mode", PROP_ENUM, PROP_NONE);
+ RNA_def_property_enum_items(prop, prop_mode_color_items);
+ RNA_def_property_ui_text(prop, "Color Mode", "Method used to determine color of F-Curve in Graph Editor.");
+
+ prop= RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
+ RNA_def_property_array(prop, 3);
+ RNA_def_property_ui_text(prop, "Color", "Color of the F-Curve in the Graph Editor.");
+
/* Collections */
prop= RNA_def_property(srna, "sampled_points", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "fpt", "totvert");
Modified: branches/blender2.5/blender/source/blender/python/BPY_extern.h
===================================================================
--- branches/blender2.5/blender/source/blender/python/BPY_extern.h 2009-02-15 23:26:00 UTC (rev 18986)
+++ branches/blender2.5/blender/source/blender/python/BPY_extern.h 2009-02-15 23:28:30 UTC (rev 18987)
@@ -36,7 +36,7 @@
struct Text; /* defined in DNA_text_types.h */
struct ID; /* DNA_ID.h */
struct Object; /* DNA_object_types.h */
-struct IpoDriver; /* DNA_curve_types.h */
+struct ChannelDriver; /* DNA_anim_types.h */
struct ScriptLink; /* DNA_scriptlink_types.h */
struct ListBase; /* DNA_listBase.h */
struct SpaceText; /* DNA_space_types.h */
@@ -116,8 +116,8 @@
short eventValue, unsigned short space_event);
void BPY_pydriver_update(void);
- float BPY_pydriver_eval(struct IpoDriver *driver);
- struct Object **BPY_pydriver_get_objects(struct IpoDriver *driver);
+ float BPY_pydriver_eval(struct ChannelDriver *driver);
+ struct Object **BPY_pydriver_get_objects(struct ChannelDriver *driver);
int BPY_button_eval(char *expr, double *value);
More information about the Bf-blender-cvs
mailing list