[Bf-blender-cvs] [54a0247f59b] blender2.8: Cleanup: whitespace

Campbell Barton noreply at git.blender.org
Wed Jun 20 16:42:53 CEST 2018


Commit: 54a0247f59bb1561d17aa4756216ec6d3c804b56
Author: Campbell Barton
Date:   Wed Jun 20 16:41:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB54a0247f59bb1561d17aa4756216ec6d3c804b56

Cleanup: whitespace

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

M	release/scripts/startup/bl_ui/properties_physics_common.py
M	release/scripts/startup/bl_ui/properties_physics_field.py
M	source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl

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

diff --git a/release/scripts/startup/bl_ui/properties_physics_common.py b/release/scripts/startup/bl_ui/properties_physics_common.py
index 207608c410f..b26fbb9e906 100644
--- a/release/scripts/startup/bl_ui/properties_physics_common.py
+++ b/release/scripts/startup/bl_ui/properties_physics_common.py
@@ -240,7 +240,6 @@ def effector_weights_ui(self, context, weights, weight_type):
 def basic_force_field_settings_ui(self, context, field):
     layout = self.layout
 
-
     if not field or field.type == 'NONE':
         return
 
@@ -282,6 +281,7 @@ def basic_force_field_settings_ui(self, context, field):
     col.label(text="Collision")
     col.prop(field, "use_absorption")
 
+
 def basic_force_field_falloff_ui(self, context, field):
     layout = self.layout
 
diff --git a/release/scripts/startup/bl_ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py
index 169a55e8c1a..72b5d9f1574 100644
--- a/release/scripts/startup/bl_ui/properties_physics_field.py
+++ b/release/scripts/startup/bl_ui/properties_physics_field.py
@@ -193,6 +193,7 @@ class PHYSICS_PT_collision(PhysicButtonsPanel, Panel):
             col = layout.column()
             col.prop(settings, "absorption", text="Force Field Absorption")
 
+
 class PHYSICS_PT_collision_particle(PhysicButtonsPanel, Panel):
     bl_label = "Particle"
     bl_parent_id = "PHYSICS_PT_collision"
@@ -267,7 +268,6 @@ class PHYSICS_PT_collision_softbody(PhysicButtonsPanel, Panel):
             col.prop(settings, "thickness_inner", text="Inner", slider=True)
 
 
-
 classes = (
     PHYSICS_PT_field,
     PHYSICS_PT_field_falloff,
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
index 733919e0aab..931ea426fbd 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
@@ -49,7 +49,7 @@ const vec2 jit[9] = vec2[9](
 #define TRIA_VEC_RANGE BIT_RANGE(6)
 const vec2 triavec[43] = vec2[43](
 
-  /* ROUNDBOX_TRIA_ARROWS */
+	/* ROUNDBOX_TRIA_ARROWS */
 	vec2(-0.170000, 0.400000), vec2(-0.050000, 0.520000), vec2( 0.250000, 0.000000), vec2( 0.470000, -0.000000), vec2(-0.170000, -0.400000), vec2(-0.050000, -0.520000),
 	vec2( 0.170000, 0.400000), vec2( 0.050000, 0.520000), vec2(-0.250000, 0.000000), vec2(-0.470000, -0.000000), vec2( 0.170000, -0.400000), vec2( 0.050000, -0.520000),
 
@@ -64,17 +64,16 @@ const vec2 triavec[43] = vec2[43](
 	vec2(0.382684, -0.923879), vec2(-0.382683, -0.923880),
 	vec2(0.000000, -1.000000),
 
-
-  /* ROUNDBOX_TRIA_MENU - menu arrows */
-  vec2(-0.66, 0.08), vec2(-0.56, 0.20), vec2(-0.2, -0.39),
-  vec2(-0.2, -0.18), vec2(0.26, 0.08), vec2(0.15, 0.20),
+	/* ROUNDBOX_TRIA_MENU - menu arrows */
+	vec2(-0.66, 0.08), vec2(-0.56, 0.20), vec2(-0.2, -0.39),
+	vec2(-0.2, -0.18), vec2(0.26, 0.08), vec2(0.15, 0.20),
 
 
 	/* ROUNDBOX_TRIA_CHECK - check mark */
 	vec2(-0.67000, 0.020000),  vec2(-0.500000, 0.190000),  vec2(-0.130000, -0.520000),
 	vec2(-0.130000, -0.170000),  vec2(0.720000, 0.430000),   vec2(0.530000, 0.590000),
 
-    /* ROUNDBOX_TRIA_HOLD_ACTION_ARROW - hold action arrows */
+	/* ROUNDBOX_TRIA_HOLD_ACTION_ARROW - hold action arrows */
 #define OY (-0.2 / 2)
 #define SC (0.35 * 2)
 //	vec2(-0.5 + SC, 1.0 + OY),  vec2( 0.5, 1.0 + OY),  vec2( 0.5, 0.0 + OY + SC),



More information about the Bf-blender-cvs mailing list