diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-10-12 04:26:48 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-10-12 04:31:55 +0300 |
| commit | e302105981ce8d75c0a0bef4ed3935dc916b38a4 (patch) | |
| tree | 889260120a3f77053b796396496dacbeb086aa8d | |
| parent | eb6e8521c2026c3483b0368022f10fa083bf41e8 (diff) | |
Cleanup: RNA naming, use 'max' as a suffix
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_game.py | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 9673d8c5ace..ed1253ea3bf 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -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() diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 8255c220592..0ce356e2255 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -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); |