diff --git a/scripts/modules/bpy_extras/node_shader_utils.py b/scripts/modules/bpy_extras/node_shader_utils.py index ec019f005e1..0b17212b8ca 100644 --- a/scripts/modules/bpy_extras/node_shader_utils.py +++ b/scripts/modules/bpy_extras/node_shader_utils.py @@ -305,7 +305,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): specular_texture = property(specular_texture_get) - # -------------------------------------------------------------------- # Specular Tint. @@ -334,7 +333,6 @@ class PrincipledBSDFWrapper(ShaderWrapper): specular_tint_texture = property(specular_tint_texture_get) - # -------------------------------------------------------------------- # Roughness (also sort of inverse of specular hardness...). diff --git a/scripts/startup/bl_ui/node_add_menu_geometry.py b/scripts/startup/bl_ui/node_add_menu_geometry.py index 9d34e1721fe..aacd43d5875 100644 --- a/scripts/startup/bl_ui/node_add_menu_geometry.py +++ b/scripts/startup/bl_ui/node_add_menu_geometry.py @@ -152,7 +152,7 @@ class NODE_MT_geometry_node_curve_topology(Menu): node_add_menu.add_node_type(layout, "GeometryNodeCurveOfPoint") node_add_menu.add_node_type(layout, "GeometryNodeOffsetPointInCurve") node_add_menu.add_node_type(layout, "GeometryNodePointsOfCurve") - node_add_menu.draw_assets_for_catalog(layout, "Curve/Topology") + node_add_menu.draw_assets_for_catalog(layout, "Curve/Topology") class NODE_MT_geometry_node_GEO_GEOMETRY(Menu): diff --git a/scripts/startup/bl_ui/properties_object.py b/scripts/startup/bl_ui/properties_object.py index 724c1666b51..2410ed5294a 100644 --- a/scripts/startup/bl_ui/properties_object.py +++ b/scripts/startup/bl_ui/properties_object.py @@ -388,9 +388,9 @@ class OBJECT_PT_visibility(ObjectButtonsPanel, Panel): col = layout.column(heading="Show In") col.prop(ob, "hide_viewport", text="Viewports", toggle=False, invert_checkbox=True) col.prop(ob, "hide_render", text="Renders", toggle=False, invert_checkbox=True) - + if context.engine == 'BLENDER_EEVEE_NEXT': - if ob.type in ('MESH','CURVE','SURFACE','META','FONT','CURVES','POINTCLOUD','VOLUME','LIGHT'): + if ob.type in ('MESH', 'CURVE', 'SURFACE', 'META', 'FONT', 'CURVES', 'POINTCLOUD', 'VOLUME', 'LIGHT'): layout.separator() col = layout.column(heading="Light Probes") col.prop(ob, "hide_probe_volume", text="Volume", toggle=False, invert_checkbox=True) @@ -405,7 +405,6 @@ class OBJECT_PT_visibility(ObjectButtonsPanel, Panel): col.prop(ob, "is_holdout") - class OBJECT_PT_custom_props(ObjectButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} _context_path = "object" diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 07e83760ffc..ef3ec6466a8 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -225,9 +225,7 @@ typedef int (*NodeGPUExecFunction)(struct GPUMaterial *mat, struct bNodeExecData *execdata, struct GPUNodeStack *in, struct GPUNodeStack *out); -typedef void (*NodeMaterialXFunction)(void *data, - struct bNode *node, - struct bNodeSocket *out); +typedef void (*NodeMaterialXFunction)(void *data, struct bNode *node, struct bNodeSocket *out); /** * \brief Defines a node type. diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc index 6a15e0fa4e5..297153a0b1e 100644 --- a/source/blender/blenloader/intern/versioning_300.cc +++ b/source/blender/blenloader/intern/versioning_300.cc @@ -2476,7 +2476,8 @@ void blo_do_versions_300(FileData *fd, Library * /*lib*/, Main *bmain) } FOREACH_NODETREE_END; - if (!DNA_struct_member_exists(fd->filesdna, "FileAssetSelectParams", "short", "import_method")) { + if (!DNA_struct_member_exists(fd->filesdna, "FileAssetSelectParams", "short", "import_method")) + { LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) { LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) { LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) { diff --git a/source/blender/io/usd/hydra/material.cc b/source/blender/io/usd/hydra/material.cc index ca1ce716080..e28a4ebf77a 100644 --- a/source/blender/io/usd/hydra/material.cc +++ b/source/blender/io/usd/hydra/material.cc @@ -36,8 +36,8 @@ #include "intern/usd_exporter_context.h" #include "intern/usd_writer_material.h" #ifdef WITH_MATERIALX -# include "shader/materialx/node_parser.h" # include "shader/materialx/material.h" +# include "shader/materialx/node_parser.h" #endif namespace blender::io::hydra { diff --git a/source/blender/makesrna/intern/rna_render.cc b/source/blender/makesrna/intern/rna_render.cc index fda0fd45f20..e2b62c5fb5f 100644 --- a/source/blender/makesrna/intern/rna_render.cc +++ b/source/blender/makesrna/intern/rna_render.cc @@ -1001,7 +1001,8 @@ static void rna_def_render_engine(BlenderRNA *brna) prop = RNA_def_property(srna, "bl_use_materialx", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "type->flag", RE_USE_MATERIALX); RNA_def_property_flag(prop, PROP_REGISTER_OPTIONAL); - RNA_def_property_ui_text(prop, "Use MaterialX", "Use MaterialX for exporting materials to Hydra"); + RNA_def_property_ui_text( + prop, "Use MaterialX", "Use MaterialX for exporting materials to Hydra"); RNA_define_verify_sdna(true); }