[Bf-blender-cvs] [d73f6647906] master: Cleanup: trailing space, use single quotes for enums

Campbell Barton noreply at git.blender.org
Wed Oct 20 00:32:33 CEST 2021


Commit: d73f6647906d4562a191b78faa578a619090aea9
Author: Campbell Barton
Date:   Wed Oct 20 09:13:38 2021 +1100
Branches: master
https://developer.blender.org/rBd73f6647906d4562a191b78faa578a619090aea9

Cleanup: trailing space, use single quotes for enums

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

M	release/scripts/modules/rna_prop_ui.py
M	release/scripts/startup/bl_ui/properties_animviz.py
M	release/scripts/startup/bl_ui/properties_data_bone.py
M	release/scripts/startup/bl_ui/properties_freestyle.py
M	release/scripts/startup/bl_ui/space_node.py
M	release/scripts/startup/bl_ui/space_sequencer.py
M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/draw/intern/draw_manager_text.h
M	source/blender/nodes/CMakeLists.txt
M	tests/python/bl_pyapi_idprop_datablock.py

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

diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py
index 7da7ccdeddd..2cc806be10d 100644
--- a/release/scripts/modules/rna_prop_ui.py
+++ b/release/scripts/modules/rna_prop_ui.py
@@ -224,7 +224,7 @@ def draw(layout, context, context_member, property_type, *, use_edit=True):
 
         if use_edit:
             row = split.row(align=True)
-            # Do not allow editing of overridden properties (we cannot use a poll function 
+            # Do not allow editing of overridden properties (we cannot use a poll function
             # of the operators here since they's have no access to the specific property).
             row.enabled = not(is_lib_override and key in rna_item.id_data.override_library.reference)
             if is_rna:
diff --git a/release/scripts/startup/bl_ui/properties_animviz.py b/release/scripts/startup/bl_ui/properties_animviz.py
index 92e78cd32b6..44965a60489 100644
--- a/release/scripts/startup/bl_ui/properties_animviz.py
+++ b/release/scripts/startup/bl_ui/properties_animviz.py
@@ -70,14 +70,14 @@ class MotionPathButtonsPanel:
 
             col = layout.column(align=True)
 
-            row = col.row(align=True)       
+            row = col.row(align=True)
             if bones:
                 row.operator("pose.paths_update", text="Update Paths", icon='BONE_DATA')
                 row.operator("pose.paths_clear", text="", icon='X')
             else:
                 row.operator("object.paths_update", text="Update Paths", icon='OBJECT_DATA')
                 row.operator("object.paths_clear", text="", icon='X')
-            col.operator("object.paths_update_visible", text="Update All Paths", icon="WORLD")                
+            col.operator("object.paths_update_visible", text="Update All Paths", icon='WORLD')
         else:
             col = layout.column(align=True)
             col.label(text="Nothing to show yet...", icon='ERROR')
@@ -86,7 +86,7 @@ class MotionPathButtonsPanel:
                 col.operator("pose.paths_calculate", text="Calculate...", icon='BONE_DATA')
             else:
                 col.operator("object.paths_calculate", text="Calculate...", icon='OBJECT_DATA')
-            col.operator("object.paths_update_visible", text="Update All Paths", icon="WORLD")
+            col.operator("object.paths_update_visible", text="Update All Paths", icon='WORLD')
 
 
 class MotionPathButtonsPanel_display:
diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py
index daf64642f68..1a00150d6d2 100644
--- a/release/scripts/startup/bl_ui/properties_data_bone.py
+++ b/release/scripts/startup/bl_ui/properties_data_bone.py
@@ -196,7 +196,7 @@ class BONE_PT_curved(BoneButtonsPanel, Panel):
         row2.prop(bone, "bbone_handle_use_scale_start", index=1, text="Y", toggle=True)
         row2.prop(bone, "bbone_handle_use_scale_start", index=2, text="Z", toggle=True)
         split2.prop(bone, "bbone_handle_use_ease_start", text="Ease", toggle=True)
-        row.label(icon="BLANK1")
+        row.label(icon='BLANK1')
 
         col = topcol.column(align=True)
         col.prop(bone, "bbone_handle_type_end", text="End Handle")
@@ -216,7 +216,7 @@ class BONE_PT_curved(BoneButtonsPanel, Panel):
         row2.prop(bone, "bbone_handle_use_scale_end", index=1, text="Y", toggle=True)
         row2.prop(bone, "bbone_handle_use_scale_end", index=2, text="Z", toggle=True)
         split2.prop(bone, "bbone_handle_use_ease_end", text="Ease", toggle=True)
-        row.label(icon="BLANK1")
+        row.label(icon='BLANK1')
 
 
 class BONE_PT_relations(BoneButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py
index 3c765c10154..4519390f953 100644
--- a/release/scripts/startup/bl_ui/properties_freestyle.py
+++ b/release/scripts/startup/bl_ui/properties_freestyle.py
@@ -280,7 +280,7 @@ class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel
 
         col.separator()
 
-        col.menu("RENDER_MT_lineset_context_menu", icon="DOWNARROW_HLT", text="")
+        col.menu("RENDER_MT_lineset_context_menu", icon='DOWNARROW_HLT', text="")
 
         if is_sortable:
             col.separator()
diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py
index f806fc345d1..8e2533edac6 100644
--- a/release/scripts/startup/bl_ui/space_node.py
+++ b/release/scripts/startup/bl_ui/space_node.py
@@ -757,7 +757,7 @@ class NodeTreeInterfacePanel:
                 field_socket_prefixes = {
                     "NodeSocketInt", "NodeSocketColor", "NodeSocketVector", "NodeSocketBool", "NodeSocketFloat"}
                 is_field_type = any(active_socket.bl_socket_idname.startswith(prefix) for prefix in field_socket_prefixes)
-                if in_out == "OUT" and is_field_type:
+                if in_out == 'OUT' and is_field_type:
                     layout.prop(active_socket, "attribute_domain")
             active_socket.draw(context, layout)
 
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 01c33db2ddc..53e40257d9f 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -1140,7 +1140,7 @@ class SEQUENCER_PT_color_tag_picker(SequencerColorTagPicker, Panel):
         layout = self.layout
 
         row = layout.row(align=True)
-        row.operator("sequencer.strip_color_tag_set", icon="X").color = 'NONE'
+        row.operator("sequencer.strip_color_tag_set", icon='X').color = 'NONE'
         for i in range(1, 10):
             icon = 'SEQUENCE_COLOR_%02d' % i
             row.operator("sequencer.strip_color_tag_set", icon=icon).color = 'COLOR_%02d' % i
@@ -1313,15 +1313,15 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel):
         elif strip_type == 'SPEED':
             col = layout.column(align=True)
             col.prop(strip, "speed_control", text="Speed Control")
-            if strip.speed_control == "MULTIPLY":
+            if strip.speed_control == 'MULTIPLY':
                 col.prop(strip, "speed_factor", text=" ")
-            elif strip.speed_control == "LENGTH":
+            elif strip.speed_control == 'LENGTH':
                 col.prop(strip, "speed_length", text=" ")
-            elif strip.speed_control == "FRAME_NUMBER":
+            elif strip.speed_control == 'FRAME_NUMBER':
                 col.prop(strip, "speed_frame_number", text=" ")
 
             row = layout.row(align=True)
-            row.enabled = strip.speed_control != "STRETCH"
+            row.enabled = strip.speed_control != 'STRETCH'
             row = layout.row(align=True, heading="Interpolation")
             row.prop(strip, "use_frame_interpolate", text="")
 
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 1808287f7a9..1c2190bb7a0 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3602,7 +3602,7 @@ class VIEW3D_MT_pose_context_menu(Menu):
         layout.operator("pose.paths_calculate", text="Calculate Motion Paths")
         layout.operator("pose.paths_clear", text="Clear Motion Paths")
         layout.operator("pose.paths_update", text="Update Armature Motion Paths")
-        layout.operator("object.paths_update_visible", text="Update All Motion Paths")        
+        layout.operator("object.paths_update_visible", text="Update All Motion Paths")
 
         layout.separator()
 
diff --git a/source/blender/draw/intern/draw_manager_text.h b/source/blender/draw/intern/draw_manager_text.h
index 4f3a6153775..883b37c52af 100644
--- a/source/blender/draw/intern/draw_manager_text.h
+++ b/source/blender/draw/intern/draw_manager_text.h
@@ -64,4 +64,4 @@ struct DRWTextStore *DRW_text_cache_ensure(void);
 
 #ifdef __cplusplus
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/source/blender/nodes/CMakeLists.txt b/source/blender/nodes/CMakeLists.txt
index 879d24fdf53..9cf04ac3aab 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -224,7 +224,7 @@ set(SRC
   geometry/nodes/node_geo_distribute_points_on_faces.cc
   geometry/nodes/node_geo_edge_split.cc
   geometry/nodes/node_geo_input_curve_handles.cc
-  geometry/nodes/node_geo_input_curve_tilt.cc  
+  geometry/nodes/node_geo_input_curve_tilt.cc
   geometry/nodes/node_geo_input_index.cc
   geometry/nodes/node_geo_input_material.cc
   geometry/nodes/node_geo_input_material_index.cc
@@ -264,7 +264,7 @@ set(SRC
   geometry/nodes/node_geo_separate_geometry.cc
   geometry/nodes/node_geo_set_curve_handles.cc
   geometry/nodes/node_geo_set_curve_radius.cc
-  geometry/nodes/node_geo_set_curve_tilt.cc  
+  geometry/nodes/node_geo_set_curve_tilt.cc
   geometry/nodes/node_geo_set_material.cc
   geometry/nodes/node_geo_set_material_index.cc
   geometry/nodes/node_geo_set_point_radius.cc
diff --git a/tests/python/bl_pyapi_idprop_datablock.py b/tests/python/bl_pyapi_idprop_datablock.py
index d4253dc4665..5a7e4bee4fc 100644
--- a/tests/python/bl_pyapi_idprop_datablock.py
+++ b/tests/python/bl_pyapi_idprop_datablock.py
@@ -257,8 +257,8 @@ def test_restrictions1():
     # just panel for testing the poll callback with lots of objects
     class TEST_PT_DatablockProp(bpy.types.Panel):
         bl_label = "Datablock IDProp"
-        bl_space_type = "PROPERTIES"
-        bl_region_type = "WINDOW"
+        bl_space_type = 'PROPERTIES'
+        bl_region_type = 'WINDOW'
         bl_context = "render"
 
         def draw(self, context):



More information about the Bf-blender-cvs mailing list