rna naming, *_frame --> frame_*

7 files changed, 26 insertions, 26 deletions

diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c
index c6ee9e4a960..3bd8b50c889 100644
--- a/source/blender/editors/animation/fmodifier_ui.c
+++ b/source/blender/editors/animation/fmodifier_ui.c
@@ -572,19 +572,19 @@ static void draw_modifier__stepped(uiLayout *layout, ID *id, FModifier *fcm, sho
 		
 	/* block 2: start range settings */
 	col= uiLayoutColumn(layout, 1);
-		uiItemR(col, &ptr, "use_start_frame", 0, NULL, 0);
+		uiItemR(col, &ptr, "use_frame_start", 0, NULL, 0);
 		
 		subcol = uiLayoutColumn(col, 1);
-		uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_start_frame"));
-			uiItemR(subcol, &ptr, "start_frame", 0, NULL, 0);
+		uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_frame_start"));
+			uiItemR(subcol, &ptr, "frame_start", 0, NULL, 0);
 			
 	/* block 3: end range settings */
 	col= uiLayoutColumn(layout, 1);
-		uiItemR(col, &ptr, "use_end_frame", 0, NULL, 0);
+		uiItemR(col, &ptr, "use_frame_end", 0, NULL, 0);
 		
 		subcol = uiLayoutColumn(col, 1);
 		uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_end_frame"));
-			uiItemR(subcol, &ptr, "end_frame", 0, NULL, 0);
+			uiItemR(subcol, &ptr, "frame_end", 0, NULL, 0);
 }
 
 /* --------------- */
diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c
index ac3b91e275c..5751fb0300e 100644
--- a/source/blender/editors/space_graph/graph_buttons.c
+++ b/source/blender/editors/space_graph/graph_buttons.c
@@ -156,7 +156,7 @@ static void graph_panel_view(const bContext *C, Panel *pa)
 		subcol= uiLayoutColumn(col, 1);
 		uiLayoutSetActive(subcol, RNA_boolean_get(&spaceptr, "show_cursor")); 
 			row= uiLayoutSplit(subcol, 0.7, 1);
-				uiItemR(row, &sceneptr, "current_frame", 0, "Cursor X", 0);
+				uiItemR(row, &sceneptr, "frame_current", 0, "Cursor X", 0);
 				uiItemEnumO(row, "GRAPH_OT_snap", "To Keys", 0, "type", GRAPHKEYS_SNAP_CFRA);
 			row= uiLayoutSplit(subcol, 0.7, 1);
 				uiItemR(row, &spaceptr, "cursor_value", 0, "Cursor Y", 0);
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index 0a7c07bd1f1..aa3a0f58fa9 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -906,7 +906,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, char *propn
 					uiButSetFunc(but, set_frames_cb, ima, iuser);
 				}
 
-				uiItemR(col, userptr, "start_frame", 0, "Start", 0);
+				uiItemR(col, userptr, "frame_start", 0, "Start", 0);
 				uiItemR(col, userptr, "offset", 0, NULL, 0);
 
 				col= uiLayoutColumn(split, 0);
diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c
index ceee7fc9971..9b7bc9a8002 100644
--- a/source/blender/editors/space_nla/nla_buttons.c
+++ b/source/blender/editors/space_nla/nla_buttons.c
@@ -295,8 +295,8 @@ static void nla_panel_properties(const bContext *C, Panel *pa)
 	/* strip extents */
 	column= uiLayoutColumn(layout, 1);
 		uiItemL(column, "Strip Extents:", 0);
-		uiItemR(column, &strip_ptr, "start_frame", 0, NULL, 0);
-		uiItemR(column, &strip_ptr, "end_frame", 0, NULL, 0);
+		uiItemR(column, &strip_ptr, "frame_start", 0, NULL, 0);
+		uiItemR(column, &strip_ptr, "frame_end", 0, NULL, 0);
 	
 	/* extrapolation */
 	row= uiLayoutRow(layout, 1);
@@ -351,8 +351,8 @@ static void nla_panel_actclip(const bContext *C, Panel *pa)
 	// XXX custom names were used here (to avoid the prefixes)... probably not necessary in future?
 	column= uiLayoutColumn(layout, 1);
 		uiItemL(column, "Action Extents:", 0);
-		uiItemR(column, &strip_ptr, "action_start_frame", 0, "Start Frame", 0);
-		uiItemR(column, &strip_ptr, "action_end_frame", 0, "End Frame", 0);
+		uiItemR(column, &strip_ptr, "action_frame_start", 0, "Start Frame", 0);
+		uiItemR(column, &strip_ptr, "action_frame_end", 0, "End Frame", 0);
 		uiItemO(column, NULL, 0, "NLA_OT_action_sync_length");
 		
 	/* action usage */
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c
index 3a91b5c7210..5ba2c1c27c8 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -894,8 +894,8 @@ static void node_composit_buts_file_output(uiLayout *layout, bContext *C, Pointe
 	}
 	
 	row= uiLayoutRow(layout, 1);
-	uiItemR(row, ptr, "start_frame", 0, "Start", 0);
-	uiItemR(row, ptr, "end_frame", 0, "End", 0);
+	uiItemR(row, ptr, "frame_start", 0, "Start", 0);
+	uiItemR(row, ptr, "frame_end", 0, "End", 0);
 }
 
 static void node_composit_buts_scale(uiLayout *layout, bContext *C, PointerRNA *ptr)
diff --git a/source/blender/editors/space_sequencer/sequencer_add.c b/source/blender/editors/space_sequencer/sequencer_add.c
index 22d94621673..b8c233bfe3e 100644
--- a/source/blender/editors/space_sequencer/sequencer_add.c
+++ b/source/blender/editors/space_sequencer/sequencer_add.c
@@ -88,10 +88,10 @@ static void sequencer_generic_props__internal(wmOperatorType *ot, int flag)
 	RNA_def_string(ot->srna, "name", "", MAX_ID_NAME-2, "Name", "Name of the new sequence strip");
 
 	if(flag & SEQPROP_STARTFRAME)
-		RNA_def_int(ot->srna, "start_frame", 0, INT_MIN, INT_MAX, "Start Frame", "Start frame of the sequence strip", INT_MIN, INT_MAX);
+		RNA_def_int(ot->srna, "frame_start", 0, INT_MIN, INT_MAX, "Start Frame", "Start frame of the sequence strip", INT_MIN, INT_MAX);
 	
 	if(flag & SEQPROP_ENDFRAME)
-		RNA_def_int(ot->srna, "end_frame", 0, INT_MIN, INT_MAX, "End Frame", "End frame for the color strip", INT_MIN, INT_MAX); /* not useual since most strips have a fixed length */
+		RNA_def_int(ot->srna, "frame_end", 0, INT_MIN, INT_MAX, "End Frame", "End frame for the color strip", INT_MIN, INT_MAX); /* not useual since most strips have a fixed length */
 	
 	RNA_def_int(ot->srna, "channel", 1, 1, MAXSEQ, "Channel", "Channel to place this strip into", 1, MAXSEQ);
 	
@@ -116,10 +116,10 @@ static void sequencer_generic_invoke_xy__internal(bContext *C, wmOperator *op, w
 	UI_view2d_region_to_view(v2d, mval[0], mval[1], &mval_v2d[0], &mval_v2d[1]);
 	
 	RNA_int_set(op->ptr, "channel", (int)mval_v2d[1]+0.5f);
-	RNA_int_set(op->ptr, "start_frame", (int)mval_v2d[0]);
+	RNA_int_set(op->ptr, "frame_start", (int)mval_v2d[0]);
 	
-	if ((flag & SEQPROP_ENDFRAME) && RNA_property_is_set(op->ptr, "end_frame")==0)
-		RNA_int_set(op->ptr, "end_frame", (int)mval_v2d[0] + 25); // XXX arbitary but ok for now.
+	if ((flag & SEQPROP_ENDFRAME) && RNA_property_is_set(op->ptr, "frame_end")==0)
+		RNA_int_set(op->ptr, "frame_end", (int)mval_v2d[0] + 25); // XXX arbitary but ok for now.
 	
 }
 
@@ -127,7 +127,7 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op)
 {
 	memset(seq_load, 0, sizeof(SeqLoadInfo));
 
-	seq_load->start_frame=	RNA_int_get(op->ptr, "start_frame");
+	seq_load->start_frame=	RNA_int_get(op->ptr, "frame_start");
 	seq_load->end_frame=	seq_load->start_frame; /* un-set */
 
 	seq_load->channel=		RNA_int_get(op->ptr, "channel");
@@ -137,8 +137,8 @@ static void seq_load_operator_info(SeqLoadInfo *seq_load, wmOperator *op)
 
 	RNA_string_get(op->ptr, "path", seq_load->path); /* full path, file is set by the caller */
 
-	if (RNA_struct_find_property(op->ptr, "end_frame")) {
-		seq_load->end_frame = RNA_int_get(op->ptr, "end_frame");
+	if (RNA_struct_find_property(op->ptr, "frame_end")) {
+		seq_load->end_frame = RNA_int_get(op->ptr, "frame_end");
 	}
 
 	if (RNA_struct_find_property(op->ptr, "replace_sel") && RNA_boolean_get(op->ptr, "replace_sel"))
@@ -168,7 +168,7 @@ static int sequencer_add_scene_strip_exec(bContext *C, wmOperator *op)
 	
 	int start_frame, channel; /* operator props */
 	
-	start_frame= RNA_int_get(op->ptr, "start_frame");
+	start_frame= RNA_int_get(op->ptr, "frame_start");
 	channel= RNA_int_get(op->ptr, "channel");
 	
 	sce_seq= BLI_findlink(&CTX_data_main(C)->scene, RNA_enum_get(op->ptr, "scene"));
@@ -489,8 +489,8 @@ static int sequencer_add_effect_strip_exec(bContext *C, wmOperator *op)
 	Sequence *seq1, *seq2, *seq3;
 	char *error_msg;
 
-	start_frame= RNA_int_get(op->ptr, "start_frame");
-	end_frame= RNA_int_get(op->ptr, "end_frame");
+	start_frame= RNA_int_get(op->ptr, "frame_start");
+	end_frame= RNA_int_get(op->ptr, "frame_end");
 	channel= RNA_int_get(op->ptr, "channel");
 
 	type= RNA_enum_get(op->ptr, "type");
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 0e47034d881..d27b9f4795c 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -558,8 +558,8 @@ void recalcData(TransInfo *t)
 			// TODO: do we need to write in 2 passes to make sure that no truncation goes on?
 			RNA_pointer_create(NULL, &RNA_NlaStrip, strip, &strip_ptr);
 			
-			RNA_float_set(&strip_ptr, "start_frame", tdn->h1[0]);
-			RNA_float_set(&strip_ptr, "end_frame", tdn->h2[0]);
+			RNA_float_set(&strip_ptr, "frame_start", tdn->h1[0]);
+			RNA_float_set(&strip_ptr, "frame_end", tdn->h2[0]);
 			
 			/* flush transforms to child strips (since this should be a meta) */
 			BKE_nlameta_flush_transforms(strip);