[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50777] trunk/blender/source/blender: code cleanup: use frame as a prefix for rna properties

[Campbell Barton]

Revision: 50777
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50777
Author:   campbellbarton
Date:     2012-09-20 12:16:00 +0000 (Thu, 20 Sep 2012)
Log Message:
-----------
code cleanup: use frame as a prefix for rna properties

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/makesrna/intern/rna_movieclip.c
    trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2012-09-20 11:35:33 UTC (rev 50776)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2012-09-20 12:16:00 UTC (rev 50777)
@@ -2606,7 +2606,7 @@
 		uiItemR(layout, ptr, "position", 0, NULL, ICON_NONE);
 
 		if (node->custom1 == 2) {
-			uiItemR(layout, ptr, "relative_frame", 0, NULL, ICON_NONE);
+			uiItemR(layout, ptr, "frame_relative", 0, NULL, ICON_NONE);
 		}
 	}
 }

Modified: trunk/blender/source/blender/makesrna/intern/rna_movieclip.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_movieclip.c	2012-09-20 11:35:33 UTC (rev 50776)
+++ trunk/blender/source/blender/makesrna/intern/rna_movieclip.c	2012-09-20 12:16:00 UTC (rev 50777)
@@ -187,7 +187,7 @@
 	RNA_def_struct_ui_text(srna, "Movie Clip User",
 	                       "Parameters defining how a MovieClip datablock is used by another datablock");
 
-	prop = RNA_def_property(srna, "current_frame", PROP_INT, PROP_TIME);
+	prop = RNA_def_property(srna, "frame_current", PROP_INT, PROP_TIME);
 	RNA_def_property_int_sdna(prop, NULL, "framenr");
 	RNA_def_property_range(prop, MINAFRAME, MAXFRAME);
 	RNA_def_property_ui_text(prop, "Current Frame", "Current frame number in movie or image sequence");

Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2012-09-20 11:35:33 UTC (rev 50776)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c	2012-09-20 12:16:00 UTC (rev 50777)
@@ -3839,7 +3839,7 @@
 	RNA_def_property_ui_text(prop, "Position", "Which marker position to use for output");
 	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
 
-	prop = RNA_def_property(srna, "relative_frame", PROP_INT, PROP_NONE);
+	prop = RNA_def_property(srna, "frame_relative", PROP_INT, PROP_NONE);
 	RNA_def_property_int_sdna(prop, NULL, "custom2");
 	RNA_def_property_ui_text(prop, "Frame", "Frame to be used for relative position");
 	RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-09-20 11:35:33 UTC (rev 50776)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2012-09-20 12:16:00 UTC (rev 50777)
@@ -498,7 +498,7 @@
 }
 
 
-static void rna_Scene_current_frame_set(PointerRNA *ptr, int value)
+static void rna_Scene_frame_current_set(PointerRNA *ptr, int value)
 {
 	Scene *data = (Scene *)ptr->data;
 	
@@ -4300,7 +4300,7 @@
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 	RNA_def_property_int_sdna(prop, NULL, "r.cfra");
 	RNA_def_property_range(prop, MINAFRAME, MAXFRAME);
-	RNA_def_property_int_funcs(prop, NULL, "rna_Scene_current_frame_set", NULL);
+	RNA_def_property_int_funcs(prop, NULL, "rna_Scene_frame_current_set", NULL);
 	RNA_def_property_ui_text(prop, "Current Frame",
 	                         "Current Frame, to update animation data from python frame_set() instead");
 	RNA_def_property_update(prop, NC_SCENE | ND_FRAME, "rna_Scene_frame_update");