[Bf-blender-cvs] [3b0a08b7930] master: Cleanup: format
Campbell Barton
noreply at git.blender.org
Thu May 12 06:08:06 CEST 2022
Commit: 3b0a08b79306a25dd0f5ec7f92942d5c2bcc017c
Author: Campbell Barton
Date: Thu May 12 14:07:15 2022 +1000
Branches: master
https://developer.blender.org/rB3b0a08b79306a25dd0f5ec7f92942d5c2bcc017c
Cleanup: format
===================================================================
M release/scripts/startup/bl_ui/properties_data_curve.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/gpu/intern/gpu_capabilities.cc
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py
index d6e21053e3b..a421428c067 100644
--- a/release/scripts/startup/bl_ui/properties_data_curve.py
+++ b/release/scripts/startup/bl_ui/properties_data_curve.py
@@ -203,7 +203,7 @@ class DATA_PT_geometry_curve_start_end(CurveButtonsPanelCurve, Panel):
@classmethod
def poll(cls, context):
# Text objects don't support these properties
- return (type(context.curve) in {Curve})
+ return (type(context.curve) == Curve)
def draw(self, context):
layout = self.layout
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 4ff62b2ca00..995b2afebf0 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -246,7 +246,7 @@ class _draw_tool_settings_context_mode:
unified_name="use_unified_size",
text="Radius",
slider=True,
- header=True
+ header=True,
)
# strength, use_strength_pressure
@@ -259,7 +259,7 @@ class _draw_tool_settings_context_mode:
pressure_name=pressure_name,
unified_name="use_unified_strength",
text="Strength",
- header=True
+ header=True,
)
# direction
@@ -320,7 +320,7 @@ class _draw_tool_settings_context_mode:
"weight",
unified_name="use_unified_weight",
slider=True,
- header=True
+ header=True,
)
UnifiedPaintPanel.prop_unified(
@@ -332,7 +332,7 @@ class _draw_tool_settings_context_mode:
unified_name="use_unified_size",
slider=True,
text="Radius",
- header=True
+ header=True,
)
UnifiedPaintPanel.prop_unified(
layout,
@@ -341,7 +341,7 @@ class _draw_tool_settings_context_mode:
"strength",
pressure_name="use_pressure_strength",
unified_name="use_unified_strength",
- header=True
+ header=True,
)
return True
@@ -490,16 +490,16 @@ class _draw_tool_settings_context_mode:
return False
UnifiedPaintPanel.prop_unified(
- layout,
- context,
- brush,
- "size",
- unified_name="use_unified_size",
- pressure_name="use_pressure_size",
- text="Radius",
- slider=True,
- header=True
- )
+ layout,
+ context,
+ brush,
+ "size",
+ unified_name="use_unified_size",
+ pressure_name="use_pressure_size",
+ text="Radius",
+ slider=True,
+ header=True,
+ )
if brush.curves_sculpt_tool not in {'ADD', 'DELETE'}:
UnifiedPaintPanel.prop_unified(
@@ -509,7 +509,7 @@ class _draw_tool_settings_context_mode:
"strength",
unified_name="use_unified_strength",
pressure_name="use_pressure_strength",
- header=True
+ header=True,
)
if brush.curves_sculpt_tool == 'COMB':
@@ -522,7 +522,6 @@ class _draw_tool_settings_context_mode:
layout.popover("VIEW3D_PT_curves_sculpt_add_shape", text="Curve Shape")
layout.prop(brush, "use_frontface", text="Front Faces Only")
-
if brush.curves_sculpt_tool == 'GROW_SHRINK':
layout.prop(brush, "direction", expand=True, text="")
layout.prop(brush, "falloff_shape", expand=True)
diff --git a/source/blender/gpu/intern/gpu_capabilities.cc b/source/blender/gpu/intern/gpu_capabilities.cc
index 6ef015492c7..4ec215c2d3b 100644
--- a/source/blender/gpu/intern/gpu_capabilities.cc
+++ b/source/blender/gpu/intern/gpu_capabilities.cc
@@ -172,7 +172,6 @@ int GPU_max_compute_shader_storage_blocks()
return GCaps.max_compute_shader_storage_blocks;
}
-
/** \} */
/* -------------------------------------------------------------------- */
More information about the Bf-blender-cvs
mailing list