rna renaming FModifier & GameObjectSettings

3 files changed, 24 insertions, 24 deletions

diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c
index 2f91d8eee68..191316711f4 100644
--- a/source/blender/editors/animation/fmodifier_ui.c
+++ b/source/blender/editors/animation/fmodifier_ui.c
@@ -119,7 +119,7 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s
 		but= uiDefButR(block, MENU, B_FMODIFIER_REDRAW, NULL, 0, 0, width-30, UI_UNIT_Y, &ptr, "mode", -1, 0, 0, -1, -1, NULL);
 		uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL);
 		
-		uiDefButR(block, TOG, B_FMODIFIER_REDRAW, NULL, 0, 0, width-30, UI_UNIT_Y, &ptr, "additive", -1, 0, 0, -1, -1, NULL);
+		uiDefButR(block, TOG, B_FMODIFIER_REDRAW, NULL, 0, 0, width-30, UI_UNIT_Y, &ptr, "use_additive", -1, 0, 0, -1, -1, NULL);
 	uiBlockEndAlign(block);
 	
 	/* now add settings for individual modes */
@@ -226,7 +226,7 @@ static void draw_modifier__fn_generator(uiLayout *layout, ID *id, FModifier *fcm
 	/* add the settings */
 	col= uiLayoutColumn(layout, 1);
 		uiItemR(col, &ptr, "function_type", 0, "", 0);
-		uiItemR(col, &ptr, "additive", UI_ITEM_R_TOGGLE, NULL, 0);
+		uiItemR(col, &ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, 0);
 	
 	col= uiLayoutColumn(layout, 0); // no grouping for now
 		uiItemR(col, &ptr, "amplitude", 0, NULL, 0);
@@ -254,14 +254,14 @@ static void draw_modifier__cycles(uiLayout *layout, ID *id, FModifier *fcm, shor
 	/* before range */
 	col= uiLayoutColumn(split, 1);
 		uiItemL(col, "Before:", 0);
-		uiItemR(col, &ptr, "before_mode", 0, "", 0);
-		uiItemR(col, &ptr, "before_cycles", 0, NULL, 0);
+		uiItemR(col, &ptr, "mode_before", 0, "", 0);
+		uiItemR(col, &ptr, "cycles_before", 0, NULL, 0);
 		
 	/* after range */
 	col= uiLayoutColumn(split, 1);
 		uiItemL(col, "After:", 0);
-		uiItemR(col, &ptr, "after_mode", 0, "", 0);
-		uiItemR(col, &ptr, "after_cycles", 0, NULL, 0);
+		uiItemR(col, &ptr, "mode_after", 0, "", 0);
+		uiItemR(col, &ptr, "cycles_after", 0, NULL, 0);
 }
 
 /* --------------- */
@@ -473,8 +473,8 @@ static void draw_modifier__envelope(uiLayout *layout, ID *id, FModifier *fcm, sh
 		uiItemR(col, &ptr, "reference_value", 0, NULL, 0);
 		
 		row= uiLayoutRow(col, 1);
-			uiItemR(row, &ptr, "default_minimum", 0, "Min", 0);
-			uiItemR(row, &ptr, "default_maximum", 0, "Max", 0);
+			uiItemR(row, &ptr, "default_min", 0, "Min", 0);
+			uiItemR(row, &ptr, "default_max", 0, "Max", 0);
 			
 	/* control points header */
 	// TODO: move this control-point control stuff to using the new special widgets for lists
@@ -526,13 +526,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor
 		
 		/* x-minimum */
 		col= uiLayoutColumn(split, 1);
-			uiItemR(col, &ptr, "use_minimum_x", 0, NULL, 0);
-			uiItemR(col, &ptr, "minimum_x", 0, NULL, 0);
+			uiItemR(col, &ptr, "use_min_x", 0, NULL, 0);
+			uiItemR(col, &ptr, "min_x", 0, NULL, 0);
 			
 		/* y-minimum*/
 		col= uiLayoutColumn(split, 1);
-			uiItemR(col, &ptr, "use_minimum_y", 0, NULL, 0);
-			uiItemR(col, &ptr, "minimum_y", 0, NULL, 0);
+			uiItemR(col, &ptr, "use_min_y", 0, NULL, 0);
+			uiItemR(col, &ptr, "min_y", 0, NULL, 0);
 	}
 	
 	/* row 2: maximum */
@@ -544,13 +544,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor
 		
 		/* x-minimum */
 		col= uiLayoutColumn(split, 1);
-			uiItemR(col, &ptr, "use_maximum_x", 0, NULL, 0);
-			uiItemR(col, &ptr, "maximum_x", 0, NULL, 0);
+			uiItemR(col, &ptr, "use_max_x", 0, NULL, 0);
+			uiItemR(col, &ptr, "max_x", 0, NULL, 0);
 			
 		/* y-minimum*/
 		col= uiLayoutColumn(split, 1);
-			uiItemR(col, &ptr, "use_maximum_y", 0, NULL, 0);
-			uiItemR(col, &ptr, "maximum_y", 0, NULL, 0);
+			uiItemR(col, &ptr, "use_max_y", 0, NULL, 0);
+			uiItemR(col, &ptr, "max_y", 0, NULL, 0);
 	}
 }
 
@@ -567,8 +567,8 @@ static void draw_modifier__stepped(uiLayout *layout, ID *id, FModifier *fcm, sho
 	
 	/* block 1: "stepping" settings */
 	col= uiLayoutColumn(layout, 0);
-		uiItemR(col, &ptr, "step_size", 0, NULL, 0);
-		uiItemR(col, &ptr, "offset", 0, NULL, 0);
+		uiItemR(col, &ptr, "frame_step", 0, NULL, 0);
+		uiItemR(col, &ptr, "frame_offset", 0, NULL, 0);
 		
 	/* block 2: start range settings */
 	col= uiLayoutColumn(layout, 1);
diff --git a/source/blender/editors/space_graph/graph_edit.c b/source/blender/editors/space_graph/graph_edit.c
index 01378d9ef85..5c692ba1112 100644
--- a/source/blender/editors/space_graph/graph_edit.c
+++ b/source/blender/editors/space_graph/graph_edit.c
@@ -1043,7 +1043,7 @@ static int graphkeys_sound_bake_exec(bContext *C, wmOperator *op)
 									  RNA_float_get(op->ptr, "release"),
 									  RNA_float_get(op->ptr, "threshold"),
 									  RNA_boolean_get(op->ptr, "accumulate"),
-									  RNA_boolean_get(op->ptr, "additive"),
+									  RNA_boolean_get(op->ptr, "use_additive"),
 									  RNA_boolean_get(op->ptr, "square"),
 									  RNA_float_get(op->ptr, "sthreshold"),
 									  FPS, &sbi.length);
@@ -1118,7 +1118,7 @@ void GRAPH_OT_sound_bake (wmOperatorType *ot)
 	RNA_def_float(ot->srna, "release", 0.2, 0.0, 5.0, "Release time", "", 0.01, 0.2);
 	RNA_def_float(ot->srna, "threshold", 0.0, 0.0, 1.0, "Threshold", "", 0.01, 0.1);
 	RNA_def_boolean(ot->srna, "accumulate", 0, "Accumulate", "");
-	RNA_def_boolean(ot->srna, "additive", 0, "Additive", "");
+	RNA_def_boolean(ot->srna, "use_additive", 0, "Additive", "");
 	RNA_def_boolean(ot->srna, "square", 0, "Square", "");
 	RNA_def_float(ot->srna, "sthreshold", 0.1, 0.0, 1.0, "Square Threshold", "", 0.01, 0.1);
 }
diff --git a/source/blender/editors/space_logic/logic_window.c b/source/blender/editors/space_logic/logic_window.c
index 334efb1479b..8a703c510c4 100644
--- a/source/blender/editors/space_logic/logic_window.c
+++ b/source/blender/editors/space_logic/logic_window.c
@@ -4508,13 +4508,13 @@ static void logic_buttons_new(bContext *C, ARegion *ar)
 			subsplit= uiLayoutSplit(split, 0.85, 0);
 			col= uiLayoutColumn(subsplit, 0);
 			row= uiLayoutRow(col, 0);
-			uiLayoutSetActive(row, RNA_boolean_get(&settings_ptr, "all_states")==0);
-			uiTemplateLayers(row, &settings_ptr, "visible_state", &settings_ptr, "used_states", 0);
+			uiLayoutSetActive(row, RNA_boolean_get(&settings_ptr, "use_all_states")==0);
+			uiTemplateLayers(row, &settings_ptr, "states_visible", &settings_ptr, "used_states", 0);
 			row= uiLayoutRow(col, 0);
-			uiTemplateLayers(row, &settings_ptr, "initial_state", &settings_ptr, "used_states", 0);
+			uiTemplateLayers(row, &settings_ptr, "states_initial", &settings_ptr, "used_states", 0);
 
 			col= uiLayoutColumn(subsplit, 0);
-			uiItemR(col, &settings_ptr, "all_states", UI_ITEM_R_TOGGLE, NULL, 0);
+			uiItemR(col, &settings_ptr, "use_all_states", UI_ITEM_R_TOGGLE, NULL, 0);
 			uiItemR(col, &settings_ptr, "show_debug_state", 0, "", 0); 
 		}