Cleanup: RNA naming, use 'max' as a suffix
authorCampbell Barton <ideasman42@gmail.com>
Mon, 12 Oct 2015 01:26:48 +0000 (12:26 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 12 Oct 2015 01:31:55 +0000 (12:31 +1100)
release/scripts/startup/bl_ui/properties_game.py
source/blender/makesrna/intern/rna_object.c

index 9673d8c5acea9522ddfe5bedda80741666260b43..ed1253ea3bfc899c16e36925fea215efb25c885b 100644 (file)
@@ -55,7 +55,7 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel):
             layout.prop(game, "step_height", slider=True)
             layout.prop(game, "jump_speed")
             layout.prop(game, "fall_speed")
-            layout.prop(game, "max_jumps")
+            layout.prop(game, "jump_max")
 
         elif physics_type in {'DYNAMIC', 'RIGID_BODY'}:
             split = layout.split()
index 8255c220592a7184bc8e7f16481125d8ae6bd947..0ce356e2255f27bde04a96aba80ea559ff53c81d 100644 (file)
@@ -1771,7 +1771,7 @@ static void rna_def_object_game_settings(BlenderRNA *brna)
        RNA_def_property_float_default(prop, 55.0f);
        RNA_def_property_ui_text(prop, "Fall Speed Max", "Maximum speed at which the character will fall");
 
-       prop = RNA_def_property(srna, "max_jumps", PROP_INT, PROP_NONE);
+       prop = RNA_def_property(srna, "jump_max", PROP_INT, PROP_NONE);
        RNA_def_property_int_sdna(prop, NULL, "max_jumps");
        RNA_def_property_range(prop, 1, CHAR_MAX);
        RNA_def_property_ui_range(prop, 1, 10, 1, 1);