[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31423] trunk/blender/source/blender: apply logic brick rna renaming

Campbell Barton ideasman42 at gmail.com
Tue Aug 17 18:27:10 CEST 2010


Revision: 31423
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31423
Author:   campbellbarton
Date:     2010-08-17 18:27:10 +0200 (Tue, 17 Aug 2010)

Log Message:
-----------
apply logic brick rna renaming

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_logic/logic_window.c
    trunk/blender/source/blender/makesrna/intern/rna_actuator.c
    trunk/blender/source/blender/makesrna/intern/rna_controller.c
    trunk/blender/source/blender/makesrna/intern/rna_object.c
    trunk/blender/source/blender/makesrna/intern/rna_sensor.c

Modified: trunk/blender/source/blender/editors/space_logic/logic_window.c
===================================================================
--- trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-08-17 14:56:10 UTC (rev 31422)
+++ trunk/blender/source/blender/editors/space_logic/logic_window.c	2010-08-17 16:27:10 UTC (rev 31423)
@@ -1925,7 +1925,7 @@
 					uiDefButBitS(block, TOG, ACT_LIN_VEL_LOCAL, 0, "L",		xco+45+3*wval, yco-129, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
 					uiDefButBitS(block, TOG, ACT_ANG_VEL_LOCAL, 0, "L",		xco+45+3*wval, yco-148, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local transformation");
 				
-					uiDefButBitS(block, TOG, ACT_ADD_LIN_VEL, 0, "add",xco+45+3*wval+15, yco-129, 35, 19, &oa->flag, 0.0, 0.0, 0, 0, "Toggles between ADD and SET linV");
+					uiDefButBitS(block, TOG, ACT_ADD_LIN_VEL, 0, "use_additive",xco+45+3*wval+15, yco-129, 35, 19, &oa->flag, 0.0, 0.0, 0, 0, "Toggles between ADD and SET linV");
 				}				
 			} else if (oa->type == ACT_OBJECT_SERVO)
 			{
@@ -3183,8 +3183,8 @@
 	box= uiLayoutBox(layout);
 	row= uiLayoutRow(box, 0);
 	
-	uiItemR(row, ptr, "expanded", UI_ITEM_R_NO_BG, "", 0);
-	if(RNA_boolean_get(ptr, "expanded")) {
+	uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", 0);
+	if(RNA_boolean_get(ptr, "show_expanded")) {
 		uiItemR(row, ptr, "type", 0, "", 0);
 		uiItemR(row, ptr, "name", 0, "", 0);
 	} else {
@@ -3194,10 +3194,10 @@
 
 	subrow= uiLayoutRow(row, 0);
 	uiLayoutSetActive(subrow, ((RNA_boolean_get(logic_ptr, "show_sensors_active_states")
-							&& RNA_boolean_get(ptr, "expanded")) || RNA_boolean_get(ptr, "pinned")));
-	uiItemR(subrow, ptr, "pinned", UI_ITEM_R_NO_BG, "", 0);
+							&& RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin")));
+	uiItemR(subrow, ptr, "pin", UI_ITEM_R_NO_BG, "", 0);
 
-	if(RNA_boolean_get(ptr, "expanded")==0) {
+	if(RNA_boolean_get(ptr, "show_expanded")==0) {
 		subrow= uiLayoutRow(row, 1);
 		uiItemEnumO(subrow, "LOGIC_OT_sensor_move", "", ICON_TRIA_UP, "direction", 1); // up
 		uiItemEnumO(subrow, "LOGIC_OT_sensor_move", "", ICON_TRIA_DOWN, "direction", 2); // down
@@ -3214,13 +3214,13 @@
 	split = uiLayoutSplit(box, 0.45, 0);
 	
 	row= uiLayoutRow(split, 1);
-	uiItemR(row, ptr, "pulse_true_level", 0, "", ICON_DOTSUP);
-	uiItemR(row, ptr, "pulse_false_level", 0, "", ICON_DOTSDOWN);
+	uiItemR(row, ptr, "use_pulse_true_level", 0, "", ICON_DOTSUP);
+	uiItemR(row, ptr, "use_pulse_false_level", 0, "", ICON_DOTSDOWN);
 	uiItemR(row, ptr, "frequency", 0, "Freq", 0);
 	
 	row= uiLayoutRow(split, 1);
-	uiItemR(row, ptr, "level", UI_ITEM_R_TOGGLE, NULL, 0);
-	uiItemR(row, ptr, "tap", UI_ITEM_R_TOGGLE, NULL, 0);
+	uiItemR(row, ptr, "use_level", UI_ITEM_R_TOGGLE, NULL, 0);
+	uiItemR(row, ptr, "use_tap", UI_ITEM_R_TOGGLE, NULL, 0);
 	
 	row= uiLayoutRow(split, 1);
 	uiItemR(row, ptr, "invert", UI_ITEM_R_TOGGLE, "Invert", 0);
@@ -3275,10 +3275,10 @@
 
 	split = uiLayoutSplit(layout, 0.3, 0);
 	row = uiLayoutRow(split, 1);
-	uiItemR(row, ptr, "pulse", UI_ITEM_R_TOGGLE, NULL, 0);
-	uiItemR(row, ptr, "collision_type", UI_ITEM_R_TOGGLE, NULL, 0);
+	uiItemR(row, ptr, "use_pulse", UI_ITEM_R_TOGGLE, NULL, 0);
+	uiItemR(row, ptr, "use_material", UI_ITEM_R_TOGGLE, NULL, 0);
 
-	switch (RNA_enum_get(ptr, "collision_type")) {
+	switch (RNA_enum_get(ptr, "use_material")) {
 		case SENS_COLLISION_PROPERTY:
 			uiItemR(split, ptr, "property", 0, NULL, 0);
 			break;
@@ -3296,7 +3296,7 @@
 
 	uiItemR(row, ptr, "delay", 0, NULL, 0);
 	uiItemR(row, ptr, "duration", 0, NULL, 0);
-	uiItemR(row, ptr, "repeat", 0, NULL, 0);
+	uiItemR(row, ptr, "use_repeat", 0, NULL, 0);
 }
 
 static void draw_sensor_joystick(uiLayout *layout, PointerRNA *ptr)
@@ -3308,10 +3308,10 @@
 
 	switch (RNA_enum_get(ptr, "event_type")) {
 		case SENS_JOY_BUTTON:
-			uiItemR(layout, ptr, "all_events", 0, NULL, 0);
+			uiItemR(layout, ptr, "use_all_events", 0, NULL, 0);
 
 			col = uiLayoutColumn(layout, 0);
-			uiLayoutSetActive(col, RNA_boolean_get(ptr, "all_events")==0);
+			uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events")==0);
 			uiItemR(col, ptr, "button_number", 0, NULL, 0);
 			break;
 		case SENS_JOY_AXIS:
@@ -3319,17 +3319,17 @@
 			uiItemR(row, ptr, "axis_number", 0, NULL, 0);
 			uiItemR(row, ptr, "axis_threshold", 0, NULL, 0);
 
-			uiItemR(layout, ptr, "all_events", 0, NULL, 0);
+			uiItemR(layout, ptr, "use_all_events", 0, NULL, 0);
 			col = uiLayoutColumn(layout, 0);
-			uiLayoutSetActive(col, RNA_boolean_get(ptr, "all_events")==0);
+			uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events")==0);
 			uiItemR(col, ptr, "axis_direction", 0, NULL, 0);
 			break;
 		case SENS_JOY_HAT:
 			uiItemR(layout, ptr, "hat_number", 0, NULL, 0);
-			uiItemR(layout, ptr, "all_events", 0, NULL, 0);
+			uiItemR(layout, ptr, "use_all_events", 0, NULL, 0);
 
 			col = uiLayoutColumn(layout, 0);
-			uiLayoutSetActive(col, RNA_boolean_get(ptr, "all_events")==0);
+			uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events")==0);
 			uiItemR(col, ptr, "hat_direction", 0, NULL, 0);
 			break;
 		case SENS_JOY_AXIS_SINGLE:
@@ -3349,20 +3349,20 @@
 	row = uiLayoutRow(layout, 0);
 	uiItemL(row, "Key:", 0);
 	col = uiLayoutColumn(row, 0);
-	uiLayoutSetActive(col, RNA_boolean_get(ptr, "all_keys")==0);
+	uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_keys")==0);
 	uiItemR(col, ptr, "key", UI_ITEM_R_EVENT, "", 0);
 	col = uiLayoutColumn(row, 0);
-	uiItemR(col, ptr, "all_keys", UI_ITEM_R_TOGGLE, NULL, 0);
+	uiItemR(col, ptr, "use_all_keys", UI_ITEM_R_TOGGLE, NULL, 0);
 	
 	col = uiLayoutColumn(layout, 0);
-	uiLayoutSetActive(col, RNA_boolean_get(ptr, "all_keys")==0);
+	uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_keys")==0);
 	row = uiLayoutRow(col, 0);
 	uiItemL(row, "First Modifier:", 0);
-	uiItemR(row, ptr, "modifier_key", UI_ITEM_R_EVENT, "", 0);
+	uiItemR(row, ptr, "modifier_key_1", UI_ITEM_R_EVENT, "", 0);
 	
 	row = uiLayoutRow(col, 0);
 	uiItemL(row, "Second Modifier:", 0);
-	uiItemR(row, ptr, "second_modifier_key", UI_ITEM_R_EVENT, "", 0);
+	uiItemR(row, ptr, "modifier_key_2", UI_ITEM_R_EVENT, "", 0);
 
 	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
 	uiItemPointerR(layout, ptr, "target", &settings_ptr, "properties", NULL, 0);
@@ -3404,8 +3404,8 @@
 	switch (RNA_enum_get(ptr, "evaluation_type")) {
 		case SENS_PROP_INTERVAL:
 			row = uiLayoutRow(layout, 0);
-			uiItemR(row, ptr, "min_value", 0, NULL, 0);
-			uiItemR(row, ptr, "max_value", 0, NULL, 0);
+			uiItemR(row, ptr, "value_min", 0, NULL, 0);
+			uiItemR(row, ptr, "value_max", 0, NULL, 0);
 			break;
 		case SENS_PROP_EQUAL:
 			uiItemR(layout, ptr, "value", 0, NULL, 0);
@@ -3456,7 +3456,7 @@
 	uiItemR(split, ptr, "axis", 0, "", 0);
 	row= uiLayoutRow(split, 0);	
 	uiItemR(row, ptr, "range", 0, NULL, 0);
-	uiItemR(row, ptr, "x_ray_mode", UI_ITEM_R_TOGGLE, NULL, 0);
+	uiItemR(row, ptr, "use_x_ray", UI_ITEM_R_TOGGLE, NULL, 0);
 }
 
 static void draw_sensor_touch(uiLayout *layout, PointerRNA *ptr)
@@ -3468,7 +3468,7 @@
 {
 	uiLayout *box;
 	
-	if (!RNA_boolean_get(ptr, "expanded"))
+	if (!RNA_boolean_get(ptr, "show_expanded"))
 		return;
 
 	draw_sensor_internal_header(layout, ptr);
@@ -3531,13 +3531,13 @@
 	bController *cont= (bController *)ptr->data;
 
 	char state[3];
-	sprintf(state, "%d", RNA_int_get(ptr, "state"));
+	sprintf(state, "%d", RNA_int_get(ptr, "states"));
 	
 	box= uiLayoutBox(layout);
 	row= uiLayoutRow(box, 0);
 	
-	uiItemR(row, ptr, "expanded", UI_ITEM_R_NO_BG, "", 0);
-	if(RNA_boolean_get(ptr, "expanded")) {
+	uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", 0);
+	if(RNA_boolean_get(ptr, "show_expanded")) {
 		uiItemR(row, ptr, "type", 0, "", 0);
 		uiItemR(row, ptr, "name", 0, "", 0);
 		/* XXX provisory for Blender 2.50Beta */
@@ -3548,9 +3548,9 @@
 		uiItemL(row, state, 0);
 	}
 
-	uiItemR(row, ptr, "priority", 0, "", 0);
+	uiItemR(row, ptr, "use_priority", 0, "", 0);
 
-	if(RNA_boolean_get(ptr, "expanded")==0) {
+	if(RNA_boolean_get(ptr, "show_expanded")==0) {
 		subrow= uiLayoutRow(row, 1);
 		uiItemEnumO(subrow, "LOGIC_OT_controller_move", "", ICON_TRIA_UP, "direction", 1); // up
 		uiItemEnumO(subrow, "LOGIC_OT_controller_move", "", ICON_TRIA_DOWN, "direction", 2); // down
@@ -3575,7 +3575,7 @@
 	else {
 		subsplit = uiLayoutSplit(split, 0.8, 0);
 		uiItemR(subsplit, ptr, "module", 0, "", 0);
-		uiItemR(subsplit, ptr, "debug", UI_ITEM_R_TOGGLE, NULL, 0);
+		uiItemR(subsplit, ptr, "use_debug", UI_ITEM_R_TOGGLE, NULL, 0);
 	}
 }
 
@@ -3588,7 +3588,7 @@
 {
 	uiLayout *box;
 	
-	if (!RNA_boolean_get(ptr, "expanded"))
+	if (!RNA_boolean_get(ptr, "show_expanded"))
 		return;
 	
 	box = uiLayoutBox(layout);
@@ -3626,8 +3626,8 @@
 	box= uiLayoutBox(layout);
 	row= uiLayoutRow(box, 0);
 	
-	uiItemR(row, ptr, "expanded", UI_ITEM_R_NO_BG, "", 0);
-	if(RNA_boolean_get(ptr, "expanded")) {
+	uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", 0);
+	if(RNA_boolean_get(ptr, "show_expanded")) {
 		uiItemR(row, ptr, "type", 0, "", 0);
 		uiItemR(row, ptr, "name", 0, "", 0);
 	} else {
@@ -3637,10 +3637,10 @@
 
 	subrow= uiLayoutRow(row, 0);
 	uiLayoutSetActive(subrow, ((RNA_boolean_get(logic_ptr, "show_actuators_active_states")
-							&& RNA_boolean_get(ptr, "expanded")) || RNA_boolean_get(ptr, "pinned")));
-	uiItemR(subrow, ptr, "pinned", UI_ITEM_R_NO_BG, "", 0);
+							&& RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin")));
+	uiItemR(subrow, ptr, "pin", UI_ITEM_R_NO_BG, "", 0);
 
-	if(RNA_boolean_get(ptr, "expanded")==0) {
+	if(RNA_boolean_get(ptr, "show_expanded")==0) {
 		subrow= uiLayoutRow(row, 1);
 		uiItemEnumO(subrow, "LOGIC_OT_actuator_move", "", ICON_TRIA_UP, "direction", 1); // up
 		uiItemEnumO(subrow, "LOGIC_OT_actuator_move", "", ICON_TRIA_DOWN, "direction", 2); // down
@@ -3661,9 +3661,9 @@
 	RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
 
 	row= uiLayoutRow(layout, 0);
-	uiItemR(row, ptr, "mode", 0, "", 0);
+	uiItemR(row, ptr, "play_mode", 0, "", 0);
 	uiItemR(row, ptr, "action", 0, NULL, 0);
-	uiItemR(row, ptr, "continue_last_frame", 0, NULL, 0);
+	uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, 0);
 
 	row= uiLayoutRow(layout, 0);
 	if((RNA_enum_get(ptr, "mode") == ACT_ACTION_FROM_PROP))
@@ -3675,7 +3675,7 @@
 	}
 
 	row= uiLayoutRow(layout, 0);
-	uiItemR(row, ptr, "blendin", 0, NULL, 0);
+	uiItemR(row, ptr, "frame_blend_in", 0, NULL, 0);
 	uiItemR(row, ptr, "priority", 0, NULL, 0);
 

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list