[Bf-blender-cvs] [e302105] master: Cleanup: RNA naming, use 'max' as a suffix

Campbell Barton noreply at git.blender.org
Mon Oct 12 03:40:04 CEST 2015


Commit: e302105981ce8d75c0a0bef4ed3935dc916b38a4
Author: Campbell Barton
Date:   Mon Oct 12 12:26:48 2015 +1100
Branches: master
https://developer.blender.org/rBe302105981ce8d75c0a0bef4ed3935dc916b38a4

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

===================================================================

M	release/scripts/startup/bl_ui/properties_game.py
M	source/blender/makesrna/intern/rna_object.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py
index 9673d8c..ed1253e 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 8255c22..0ce356e 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);




More information about the Bf-blender-cvs mailing list