Merge branch 'master' into 28

2018-06-05 16:35:20 +02:00
parent d94df18550 c68429bc03
commit 7436fb2ef1
32 changed files with 158 additions and 137 deletions
--- a/release/scripts/startup/bl_ui/properties_physics_common.py
+++ b/release/scripts/startup/bl_ui/properties_physics_common.py
@@ -274,7 +274,7 @@ def basic_force_field_settings_ui(self, context, field):
    elif field.type == 'HARMONIC':
        col.prop(field, "use_multiple_springs")
    if field.type == 'FORCE':
-        col.prop(field, "use_gravity_falloff",  text="Gravitation")
+        col.prop(field, "use_gravity_falloff", text="Gravitation")

    split = layout.split()