blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: whitespace

This commit is contained in:
Campbell Barton 2018-06-20 16:41:02 +02:00
parent b998ccefee
commit 54a0247f59
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_physics_common.py
View File

@ -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

2
release/scripts/startup/bl_ui/properties_physics_field.py
View File

@ -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,

11
source/blender/gpu/shaders/gpu_shader_2D_widget_base_vert.glsl
View File

@ -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),