[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20909] branches/blender2.5/blender/source /blender: RNA

Brecht Van Lommel brecht at blender.org
Tue Jun 16 02:52:21 CEST 2009


Revision: 20909
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20909
Author:   blendix
Date:     2009-06-16 02:52:21 +0200 (Tue, 16 Jun 2009)

Log Message:
-----------
RNA
* Added icon to property and enum property items. The latter is
  responsible for the large number of files changed.
* For RNA functions, added PROP_RNAPTR flag to ask for a PointerRNA
  as argument instead of a C pointer, instead of doing it implicitly
  with the AnyType type.

* Material: properly wrap diffuse/specular param variables, and
  rename some things for consistency.
* MaterialTextureSlot: added "enabled" property (ma->septex).
* Image: make animated property editable.
* Image Editor: make some things editable, notifiers, respect state.
* Context: fix issue with screen not being set as ID.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
    branches/blender2.5/blender/source/blender/editors/animation/keyingsets.c
    branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
    branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
    branches/blender2.5/blender/source/blender/editors/curve/editcurve.c
    branches/blender2.5/blender/source/blender/editors/curve/editfont.c
    branches/blender2.5/blender/source/blender/editors/interface/interface_api.c
    branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
    branches/blender2.5/blender/source/blender/editors/mesh/editmesh_loop.c
    branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
    branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
    branches/blender2.5/blender/source/blender/editors/object/object_edit.c
    branches/blender2.5/blender/source/blender/editors/physics/editparticle.c
    branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
    branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c
    branches/blender2.5/blender/source/blender/editors/space_action/action_edit.c
    branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
    branches/blender2.5/blender/source/blender/editors/space_graph/graph_edit.c
    branches/blender2.5/blender/source/blender/editors/space_graph/graph_select.c
    branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c
    branches/blender2.5/blender/source/blender/editors/space_node/node_select.c
    branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/blender2.5/blender/source/blender/editors/space_text/text_ops.c
    branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
    branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
    branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
    branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
    branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
    branches/blender2.5/blender/source/blender/makesrna/RNA_define.h
    branches/blender2.5/blender/source/blender/makesrna/RNA_types.h
    branches/blender2.5/blender/source/blender/makesrna/SConscript
    branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt
    branches/blender2.5/blender/source/blender/makesrna/intern/Makefile
    branches/blender2.5/blender/source/blender/makesrna/intern/SConscript
    branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_actuator.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_animation.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_color.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_constraint.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_context.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_controller.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_curve.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_fcurve.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal_types.h
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_key.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_lamp.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_lattice.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_mesh.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_modifier.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_object_force.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_particle.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_pose.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_property.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_radio.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_screen.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_sensor.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_sound.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_ui.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_vpaint.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_world.c
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c	2009-06-15 22:36:08 UTC (rev 20908)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c	2009-06-16 00:52:21 UTC (rev 20909)
@@ -721,17 +721,17 @@
 
 /* defines for setting animation-channel flags */
 EnumPropertyItem prop_animchannel_setflag_types[] = {
-	{ACHANNEL_SETFLAG_CLEAR, "DISABLE", "Disable", ""},
-	{ACHANNEL_SETFLAG_ADD, "ENABLE", "Enable", ""},
-	{ACHANNEL_SETFLAG_TOGGLE, "TOGGLE", "Toggle", ""},
-	{0, NULL, NULL, NULL}
+	{ACHANNEL_SETFLAG_CLEAR, "DISABLE", 0, "Disable", ""},
+	{ACHANNEL_SETFLAG_ADD, "ENABLE", 0, "Enable", ""},
+	{ACHANNEL_SETFLAG_TOGGLE, "TOGGLE", 0, "Toggle", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 /* defines for set animation-channel settings */
 EnumPropertyItem prop_animchannel_settings_types[] = {
-	{ACHANNEL_SETTING_PROTECT, "PROTECT", "Protect", ""},
-	{ACHANNEL_SETTING_MUTE, "MUTE", "Mute", ""},
-	{0, NULL, NULL, NULL}
+	{ACHANNEL_SETTING_PROTECT, "PROTECT", 0, "Protect", ""},
+	{ACHANNEL_SETTING_MUTE, "MUTE", 0, "Mute", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 

Modified: branches/blender2.5/blender/source/blender/editors/animation/keyingsets.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/keyingsets.c	2009-06-15 22:36:08 UTC (rev 20908)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyingsets.c	2009-06-16 00:52:21 UTC (rev 20909)
@@ -106,10 +106,10 @@
 {
 	// XXX: this is also defined in rna_animation.c
 	static EnumPropertyItem prop_mode_grouping_items[] = {
-		{KSP_GROUP_NAMED, "NAMED", "Named Group", ""},
-		{KSP_GROUP_NONE, "NONE", "None", ""},
-		{KSP_GROUP_KSNAME, "KEYINGSET", "Keying Set Name", ""},
-		{0, NULL, NULL, NULL}};
+		{KSP_GROUP_NAMED, "NAMED", 0, "Named Group", ""},
+		{KSP_GROUP_NONE, "NONE", 0, "None", ""},
+		{KSP_GROUP_KSNAME, "KEYINGSET", 0, "Keying Set Name", ""},
+		{0, NULL, 0, NULL, NULL}};
 	
 	/* identifiers */
 	ot->name= "Add Keying Set Destination";

Modified: branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c	2009-06-15 22:36:08 UTC (rev 20908)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c	2009-06-16 00:52:21 UTC (rev 20909)
@@ -1957,9 +1957,9 @@
 
 
 static EnumPropertyItem prop_calc_roll_types[] = {
-	{0, "GLOBALUP", "Z-Axis Up", ""},
-	{1, "CURSOR", "Z-Axis to Cursor", ""},
-	{0, NULL, NULL, NULL}
+	{0, "GLOBALUP", 0, "Z-Axis Up", ""},
+	{1, "CURSOR", 0, "Z-Axis to Cursor", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 static int armature_calc_roll_exec(bContext *C, wmOperator *op) 
@@ -3489,9 +3489,9 @@
 void ARMATURE_OT_subdivs(wmOperatorType *ot)
 {
 	static EnumPropertyItem type_items[]= {
-		{0, "SIMPLE", "Simple", ""},
-		{1, "MULTI", "Multi", ""},
-		{0, NULL, NULL}};
+ 		{0, "SIMPLE", 0, "Simple", ""},
+		{1, "MULTI", 0, "Multi", ""},
+		{0, NULL, 0, NULL, NULL}};
 
 	/* identifiers */
 	ot->name= "subdivs";
@@ -3669,9 +3669,9 @@
 }
 
 static EnumPropertyItem prop_editarm_make_parent_types[] = {
-	{ARM_PAR_CONNECT, "CONNECTED", "Connected", ""},
-	{ARM_PAR_OFFSET, "OFFSET", "Keep Offset", ""},
-	{0, NULL, NULL, NULL}
+	{ARM_PAR_CONNECT, "CONNECTED", 0, "Connected", ""},
+	{ARM_PAR_OFFSET, "OFFSET", 0, "Keep Offset", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 static int armature_parent_set_exec(bContext *C, wmOperator *op) 
@@ -3785,9 +3785,9 @@
 }
 
 static EnumPropertyItem prop_editarm_clear_parent_types[] = {
-	{1, "CLEAR", "Clear Parent", ""},
-	{2, "DISCONNECT", "Disconnect Bone", ""},
-	{0, NULL, NULL, NULL}
+	{1, "CLEAR", 0, "Clear Parent", ""},
+	{2, "DISCONNECT", 0, "Disconnect Bone", ""},
+	{0, NULL, 0, NULL, NULL}
 };
 
 static void editbone_clear_parent(EditBone *ebone, int mode)
@@ -3973,9 +3973,9 @@
 void ARMATURE_OT_select_hierarchy(wmOperatorType *ot)
 {
 	static EnumPropertyItem direction_items[]= {
-	{BONE_SELECT_PARENT, "PARENT", "Select Parent", ""},
-	{BONE_SELECT_CHILD, "CHILD", "Select Child", ""},
-	{0, NULL, NULL, NULL}
+	{BONE_SELECT_PARENT, "PARENT", 0, "Select Parent", ""},
+	{BONE_SELECT_CHILD, "CHILD", 0, "Select Child", ""},
+	{0, NULL, 0, NULL, NULL}
 	};
 	
 	/* identifiers */

Modified: branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/poseobject.c	2009-06-15 22:36:08 UTC (rev 20908)
+++ branches/blender2.5/blender/source/blender/editors/armature/poseobject.c	2009-06-16 00:52:21 UTC (rev 20909)
@@ -500,9 +500,9 @@
 void POSE_OT_select_hierarchy(wmOperatorType *ot)
 {
 	static EnumPropertyItem direction_items[]= {
-	{BONE_SELECT_PARENT, "PARENT", "Select Parent", ""},
-	{BONE_SELECT_CHILD, "CHILD", "Select Child", ""},
-	{0, NULL, NULL, NULL}
+	{BONE_SELECT_PARENT, "PARENT", 0, "Select Parent", ""},
+	{BONE_SELECT_CHILD, "CHILD", 0, "Select Child", ""},
+	{0, NULL, 0, NULL, NULL}
 	};
 	
 	/* identifiers */

Modified: branches/blender2.5/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/curve/editcurve.c	2009-06-15 22:36:08 UTC (rev 20908)
+++ branches/blender2.5/blender/source/blender/editors/curve/editcurve.c	2009-06-16 00:52:21 UTC (rev 20909)
@@ -2475,12 +2475,12 @@
 void CURVE_OT_spline_type_set(wmOperatorType *ot)
 {
 	static EnumPropertyItem type_items[]= {
-		{CU_POLY, "POLY", "Poly", ""},
-		{CU_BEZIER, "BEZIER", "Bezier", ""},
-		{CU_CARDINAL, "CARDINAL", "Cardinal", ""},
-		{CU_BSPLINE, "B_SPLINE", "B-Spline", ""},
-		{CU_NURBS, "NURBS", "NURBS", ""},
-		{0, NULL, NULL, NULL}};
+		{CU_POLY, "POLY", 0, "Poly", ""},
+		{CU_BEZIER, "BEZIER", 0, "Bezier", ""},
+		{CU_CARDINAL, "CARDINAL", 0, "Cardinal", ""},
+		{CU_BSPLINE, "B_SPLINE", 0, "B-Spline", ""},
+		{CU_NURBS, "NURBS", 0, "NURBS", ""},
+		{0, NULL, 0, NULL, NULL}};
 
 	/* identifiers */
 	ot->name= "Set Spline Type";
@@ -2516,12 +2516,12 @@
 void CURVE_OT_handle_type_set(wmOperatorType *ot)
 {
 	static EnumPropertyItem type_items[]= {
-		{1, "AUTOMATIC", "Automatic", ""},
-		{2, "VECTOR", "Vector", ""},
-		{3, "TOGGLE_FREE_ALIGN", "Toggle Free/Align", ""},
-		{5, "ALIGN", "Align", ""},
-		{6, "FREE_ALIGN", "Free Align", ""},
-		{0, NULL, NULL, NULL}};
+		{1, "AUTOMATIC", 0, "Automatic", ""},
+		{2, "VECTOR", 0, "Vector", ""},
+		{3, "TOGGLE_FREE_ALIGN", 0, "Toggle Free/Align", ""},
+		{5, "ALIGN", 0, "Align", ""},
+		{6, "FREE_ALIGN", 0, "Free Align", ""},
+		{0, NULL, 0, NULL, NULL}};
 
 	/* identifiers */
 	ot->name= "Set Handle Type";
@@ -3582,9 +3582,9 @@
 void CURVE_OT_cyclic_toggle(wmOperatorType *ot)
 {
 	static EnumPropertyItem direction_items[]= {
-		{0, "CYCLIC_U", "Cyclic U", ""},
-		{1, "CYCLIC_V", "Cyclic V", ""},
-		{0, NULL, NULL, NULL}};
+		{0, "CYCLIC_U", 0, "Cyclic U", ""},
+		{1, "CYCLIC_V", 0, "Cyclic V", ""},
+		{0, NULL, 0, NULL, NULL}};
 
 	/* identifiers */
 	ot->name= "Toggle Cyclic";
@@ -4530,10 +4530,10 @@
 void CURVE_OT_delete(wmOperatorType *ot)
 {
 	static EnumPropertyItem type_items[] = {
-		{0, "SELECTED", "Selected", ""},
-		{1, "SEGMENT", "Segment", ""},
-		{2, "ALL", "All", ""},
-		{0, NULL, NULL, NULL}};
+		{0, "SELECTED", 0, "Selected", ""},
+		{1, "SEGMENT", 0, "Segment", ""},
+		{2, "ALL", 0, "All", ""},
+		{0, NULL, 0, NULL, NULL}};
 
 	/* identifiers */
 	ot->name= "Delete";

Modified: branches/blender2.5/blender/source/blender/editors/curve/editfont.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/curve/editfont.c	2009-06-15 22:36:08 UTC (rev 20908)
+++ branches/blender2.5/blender/source/blender/editors/curve/editfont.c	2009-06-16 00:52:21 UTC (rev 20909)
@@ -607,10 +607,10 @@
 /******************* set style operator ********************/
 
 static EnumPropertyItem style_items[]= {
-	{CU_BOLD, "BOLD", "Bold", ""},
-	{CU_ITALIC, "ITALIC", "Italic", ""},
-	{CU_UNDERLINE, "UNDERLINE", "Underline", ""},
-	{0, NULL, NULL, NULL}};
+	{CU_BOLD, "BOLD", 0, "Bold", ""},
+	{CU_ITALIC, "ITALIC", 0, "Italic", ""},
+	{CU_UNDERLINE, "UNDERLINE", 0, "Underline", ""},
+	{0, NULL, 0, NULL, NULL}};
 
 static int set_style(bContext *C, int style, int clear)
 {
@@ -873,17 +873,17 @@
 /************************ move operator ************************/
 
 static EnumPropertyItem move_type_items[]= {
-	{LINE_BEGIN, "LINE_BEGIN", "Line Begin", ""},
-	{LINE_END, "LINE_END", "Line End", ""},
-	{PREV_CHAR, "PREVIOUS_CHARACTER", "Previous Character", ""},
-	{NEXT_CHAR, "NEXT_CHARACTER", "Next Character", ""},
-	{PREV_WORD, "PREVIOUS_WORD", "Previous Word", ""},
-	{NEXT_WORD, "NEXT_WORD", "Next Word", ""},
-	{PREV_LINE, "PREVIOUS_LINE", "Previous Line", ""},
-	{NEXT_LINE, "NEXT_LINE", "Next Line", ""},
-	{PREV_PAGE, "PREVIOUS_PAGE", "Previous Page", ""},
-	{NEXT_PAGE, "NEXT_PAGE", "Next Page", ""},
-	{0, NULL, NULL, NULL}};
+	{LINE_BEGIN, "LINE_BEGIN", 0, "Line Begin", ""},
+	{LINE_END, "LINE_END", 0, "Line End", ""},
+	{PREV_CHAR, "PREVIOUS_CHARACTER", 0, "Previous Character", ""},
+	{NEXT_CHAR, "NEXT_CHARACTER", 0, "Next Character", ""},
+	{PREV_WORD, "PREVIOUS_WORD", 0, "Previous Word", ""},
+	{NEXT_WORD, "NEXT_WORD", 0, "Next Word", ""},
+	{PREV_LINE, "PREVIOUS_LINE", 0, "Previous Line", ""},
+	{NEXT_LINE, "NEXT_LINE", 0, "Next Line", ""},
+	{PREV_PAGE, "PREVIOUS_PAGE", 0, "Previous Page", ""},
+	{NEXT_PAGE, "NEXT_PAGE", 0, "Next Page", ""},
+	{0, NULL, 0, NULL, NULL}};
 
 static int move_cursor(bContext *C, int type, int select)
 {
@@ -1164,13 +1164,13 @@
 /******************* delete operator **********************/
 
 static EnumPropertyItem delete_type_items[]= {
-	{DEL_ALL, "ALL", "All", ""},
-	{DEL_NEXT_CHAR, "NEXT_CHARACTER", "Next Character", ""},
-	{DEL_PREV_CHAR, "PREVIOUS_CHARACTER", "Previous Character", ""},
-	{DEL_SELECTION, "SELECTION", "Selection", ""},
-	{DEL_NEXT_SEL, "NEXT_OR_SELECTION", "Next or Selection", ""},
-	{DEL_PREV_SEL, "PREVIOUS_OR_SELECTION", "Previous or Selection", ""},
-	{0, NULL, NULL, NULL}};
+	{DEL_ALL, "ALL", 0, "All", ""},

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list