blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Cleanup: RNA naming, use 'max' as a suffix

This commit is contained in:
Campbell Barton 2015-10-12 12:26:48 +11:00
parent eb6e8521c2
commit e302105981
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_game.py
View 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()

2
source/blender/makesrna/intern/rna_object.c
View 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);