From 78952518e7c8fbb4a7866004d03f8004703f6934 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 27 Sep 2022 16:36:27 +1000 Subject: Cleanup: format --- release/scripts/startup/bl_ui/node_add_menu.py | 11 ++++++++--- .../scripts/startup/bl_ui/node_add_menu_geometry.py | 21 +++++++++++++++++++++ release/scripts/startup/bl_ui/space_userpref.py | 2 +- release/scripts/startup/nodeitems_builtins.py | 5 +++-- source/blender/gpu/intern/gpu_codegen.cc | 3 ++- 5 files changed, 35 insertions(+), 7 deletions(-) diff --git a/release/scripts/startup/bl_ui/node_add_menu.py b/release/scripts/startup/bl_ui/node_add_menu.py index 17bff9a5087..31b84b8f08a 100644 --- a/release/scripts/startup/bl_ui/node_add_menu.py +++ b/release/scripts/startup/bl_ui/node_add_menu.py @@ -6,6 +6,7 @@ from bpy.app.translations import ( contexts as i18n_contexts, ) + def add_node_type(layout, node_type, *, label=None): """Add a node type to a menu.""" bl_rna = bpy.types.Node.bl_rna_get_subclass(node_type) @@ -33,6 +34,7 @@ def draw_node_group_add_menu(context, layout): if node_tree: from nodeitems_builtins import node_tree_group_type + def contains_group(nodetree, group): if nodetree == group: return True @@ -42,9 +44,12 @@ def draw_node_group_add_menu(context, layout): return True return False - groups = [group for group in context.blend_data.node_groups if group.bl_idname == node_tree.bl_idname and - not contains_group(group, node_tree) and - not group.name.startswith('.')] + groups = [ + group for group in context.blend_data.node_groups + if (group.bl_idname == node_tree.bl_idname and + not contains_group(group, node_tree) and + not group.name.startswith('.')) + ] if groups: layout.separator() for group in groups: diff --git a/release/scripts/startup/bl_ui/node_add_menu_geometry.py b/release/scripts/startup/bl_ui/node_add_menu_geometry.py index d164d0d2c83..8495dcfbe37 100644 --- a/release/scripts/startup/bl_ui/node_add_menu_geometry.py +++ b/release/scripts/startup/bl_ui/node_add_menu_geometry.py @@ -4,6 +4,7 @@ from bpy.types import Menu from bl_ui import node_add_menu from bpy.app.translations import pgettext_iface as iface_ + class NODE_MT_geometry_node_GEO_ATTRIBUTE(Menu): bl_idname = "NODE_MT_geometry_node_GEO_ATTRIBUTE" bl_label = "Attribute" @@ -17,6 +18,7 @@ class NODE_MT_geometry_node_GEO_ATTRIBUTE(Menu): node_add_menu.add_node_type(layout, "GeometryNodeRemoveAttribute") node_add_menu.add_node_type(layout, "GeometryNodeStoreNamedAttribute") + class NODE_MT_geometry_node_GEO_COLOR(Menu): bl_idname = "NODE_MT_geometry_node_GEO_COLOR" bl_label = "Color" @@ -32,6 +34,7 @@ class NODE_MT_geometry_node_GEO_COLOR(Menu): node_add_menu.add_node_type(layout, "FunctionNodeSeparateColor") node_add_menu.add_node_type(layout, "FunctionNodeCombineColor") + class NODE_MT_geometry_node_GEO_CURVE(Menu): bl_idname = "NODE_MT_geometry_node_GEO_CURVE" bl_label = "Curve" @@ -69,6 +72,7 @@ class NODE_MT_geometry_node_GEO_CURVE(Menu): node_add_menu.add_node_type(layout, "GeometryNodeSetSplineResolution") node_add_menu.add_node_type(layout, "GeometryNodeCurveSplineType") + class NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE(Menu): bl_idname = "NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE" bl_label = "Curve Primitives" @@ -84,6 +88,7 @@ class NODE_MT_geometry_node_GEO_PRIMITIVES_CURVE(Menu): node_add_menu.add_node_type(layout, "GeometryNodeCurvePrimitiveQuadrilateral") node_add_menu.add_node_type(layout, "GeometryNodeCurvePrimitiveBezierSegment") + class NODE_MT_geometry_node_GEO_GEOMETRY(Menu): bl_idname = "NODE_MT_geometry_node_GEO_GEOMETRY" bl_label = "Geometry" @@ -108,6 +113,7 @@ class NODE_MT_geometry_node_GEO_GEOMETRY(Menu): node_add_menu.add_node_type(layout, "GeometryNodeSetID") node_add_menu.add_node_type(layout, "GeometryNodeSetPosition") + class NODE_MT_geometry_node_GEO_INPUT(Menu): bl_idname = "NODE_MT_geometry_node_GEO_INPUT" bl_label = "Input" @@ -134,6 +140,7 @@ class NODE_MT_geometry_node_GEO_INPUT(Menu): node_add_menu.add_node_type(layout, "GeometryNodeInputRadius") node_add_menu.add_node_type(layout, "GeometryNodeInputSceneTime") + class NODE_MT_geometry_node_GEO_INSTANCE(Menu): bl_idname = "NODE_MT_geometry_node_GEO_INSTANCE" bl_label = "Instances" @@ -150,6 +157,7 @@ class NODE_MT_geometry_node_GEO_INSTANCE(Menu): node_add_menu.add_node_type(layout, "GeometryNodeInputInstanceRotation") node_add_menu.add_node_type(layout, "GeometryNodeInputInstanceScale") + class NODE_MT_geometry_node_GEO_MATERIAL(Menu): bl_idname = "NODE_MT_geometry_node_GEO_MATERIAL" bl_label = "Material" @@ -164,6 +172,7 @@ class NODE_MT_geometry_node_GEO_MATERIAL(Menu): node_add_menu.add_node_type(layout, "GeometryNodeSetMaterial") node_add_menu.add_node_type(layout, "GeometryNodeSetMaterialIndex") + class NODE_MT_geometry_node_GEO_MESH(Menu): bl_idname = "NODE_MT_geometry_node_GEO_MESH" bl_label = "Mesh" @@ -200,6 +209,7 @@ class NODE_MT_geometry_node_GEO_MESH(Menu): layout.separator() node_add_menu.add_node_type(layout, "GeometryNodeSetShadeSmooth") + class NODE_MT_category_PRIMITIVES_MESH(Menu): bl_idname = "NODE_MT_category_PRIMITIVES_MESH" bl_label = "Mesh Primitives" @@ -214,6 +224,7 @@ class NODE_MT_category_PRIMITIVES_MESH(Menu): node_add_menu.add_node_type(layout, "GeometryNodeMeshIcoSphere") node_add_menu.add_node_type(layout, "GeometryNodeMeshLine") + class NODE_MT_category_GEO_OUTPUT(Menu): bl_idname = "NODE_MT_category_GEO_OUTPUT" bl_label = "Output" @@ -222,6 +233,7 @@ class NODE_MT_category_GEO_OUTPUT(Menu): layout = self.layout node_add_menu.add_node_type(layout, "GeometryNodeViewer") + class NODE_MT_category_GEO_POINT(Menu): bl_idname = "NODE_MT_category_GEO_POINT" bl_label = "Point" @@ -236,6 +248,7 @@ class NODE_MT_category_GEO_POINT(Menu): layout.separator() node_add_menu.add_node_type(layout, "GeometryNodeSetPointRadius") + class NODE_MT_category_GEO_TEXT(Menu): bl_idname = "NODE_MT_category_GEO_TEXT" bl_label = "Text" @@ -251,6 +264,7 @@ class NODE_MT_category_GEO_TEXT(Menu): layout.separator() node_add_menu.add_node_type(layout, "FunctionNodeInputSpecialCharacters") + class NODE_MT_category_GEO_TEXTURE(Menu): bl_idname = "NODE_MT_category_GEO_TEXTURE" bl_label = "Texture" @@ -268,6 +282,7 @@ class NODE_MT_category_GEO_TEXTURE(Menu): node_add_menu.add_node_type(layout, "ShaderNodeTexWave") node_add_menu.add_node_type(layout, "ShaderNodeTexWhiteNoise") + class NODE_MT_category_GEO_UTILITIES(Menu): bl_idname = "NODE_MT_category_GEO_UTILITIES" bl_label = "Utilities" @@ -290,6 +305,7 @@ class NODE_MT_category_GEO_UTILITIES(Menu): node_add_menu.add_node_type(layout, "FunctionNodeRandomValue") node_add_menu.add_node_type(layout, "FunctionNodeAlignEulerToVector") + class NODE_MT_category_GEO_UV(Menu): bl_idname = "NODE_MT_category_GEO_UV" bl_label = "UV" @@ -299,6 +315,7 @@ class NODE_MT_category_GEO_UV(Menu): node_add_menu.add_node_type(layout, "GeometryNodeUVPackIslands") node_add_menu.add_node_type(layout, "GeometryNodeUVUnwrap") + class NODE_MT_category_GEO_VECTOR(Menu): bl_idname = "NODE_MT_category_GEO_VECTOR" bl_label = "Vector" @@ -311,6 +328,7 @@ class NODE_MT_category_GEO_VECTOR(Menu): node_add_menu.add_node_type(layout, "ShaderNodeVectorMath") node_add_menu.add_node_type(layout, "ShaderNodeVectorRotate") + class NODE_MT_category_GEO_VOLUME(Menu): bl_idname = "NODE_MT_category_GEO_VOLUME" bl_label = "Volume" @@ -320,6 +338,7 @@ class NODE_MT_category_GEO_VOLUME(Menu): node_add_menu.add_node_type(layout, "GeometryNodeVolumeCube") node_add_menu.add_node_type(layout, "GeometryNodeVolumeToMesh") + class NODE_MT_category_GEO_GROUP(Menu): bl_idname = "NODE_MT_category_GEO_GROUP" bl_label = "Group" @@ -328,6 +347,7 @@ class NODE_MT_category_GEO_GROUP(Menu): layout = self.layout node_add_menu.draw_node_group_add_menu(context, layout) + class NODE_MT_category_GEO_LAYOUT(Menu): bl_idname = "NODE_MT_category_GEO_LAYOUT" bl_label = "Layout" @@ -337,6 +357,7 @@ class NODE_MT_category_GEO_LAYOUT(Menu): node_add_menu.add_node_type(layout, "NodeFrame") node_add_menu.add_node_type(layout, "NodeReroute") + class NODE_MT_geometry_node_add_all(Menu): bl_idname = "NODE_MT_geometry_node_add_all" bl_label = "" diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 81b6d03711d..441babefd60 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -1541,7 +1541,7 @@ class USERPREF_PT_input_touchpad(InputPanel, CenterAlignMixIn, Panel): @classmethod def poll(cls, context): import sys - return sys.platform[:3] == "win" or sys.platform == "darwin" + return sys.platform[:3] == "win" or sys.platform == "darwin" def draw_centered(self, context, layout): prefs = context.preferences diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 798ac9e37a5..d1946b2f01d 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -39,14 +39,15 @@ class TextureNodeCategory(SortedNodeCategory): return (context.space_data.type == 'NODE_EDITOR' and context.space_data.tree_type == 'TextureNodeTree') -# menu entry for node group tools + +# Menu entry for node group tools. def group_tools_draw(_self, layout, _context): layout.operator("node.group_make") layout.operator("node.group_ungroup") layout.separator() -# maps node tree type to group node type +# Maps node tree type to group node type. node_tree_group_type = { 'CompositorNodeTree': 'CompositorNodeGroup', 'ShaderNodeTree': 'ShaderNodeGroup', diff --git a/source/blender/gpu/intern/gpu_codegen.cc b/source/blender/gpu/intern/gpu_codegen.cc index 994a30f0944..b02d8a02704 100644 --- a/source/blender/gpu/intern/gpu_codegen.cc +++ b/source/blender/gpu/intern/gpu_codegen.cc @@ -201,7 +201,8 @@ static std::ostream &operator<<(std::ostream &stream, const GPUOutput *output) } /* Trick type to change overload and keep a somewhat nice syntax. */ -struct GPUConstant : public GPUInput {}; +struct GPUConstant : public GPUInput { +}; /* Print data constructor (i.e: vec2(1.0f, 1.0f)). */ static std::ostream &operator<<(std::ostream &stream, const GPUConstant *input) -- cgit v1.2.3