Commit: e476afff41249826dd51862af7b009571b3ca0ae Author: Campbell Barton Date: Thu Dec 15 09:34:22 2022 +1100 Branches: master https://developer.blender.org/rBe476afff41249826dd51862af7b009571b3ca0ae
Cleanup: format =================================================================== M build_files/build_environment/darwin/set_rpath.py M release/scripts/startup/bl_ui/__init__.py M source/blender/blenkernel/BKE_paint.h M source/blender/blenkernel/intern/blendfile_link_append.c M source/blender/draw/engines/image/image_private.hh M source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert_no_geom.glsl M source/blender/editors/transform/transform.h M source/blender/gpu/metal/mtl_context.mm M source/blender/makesrna/intern/rna_gpencil_modifier.c M source/blender/makesrna/intern/rna_layer.c M source/blender/makesrna/intern/rna_object.c M source/blender/makesrna/intern/rna_scene.c M source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc M source/blender/windowmanager/intern/wm_files.c =================================================================== diff --git a/build_files/build_environment/darwin/set_rpath.py b/build_files/build_environment/darwin/set_rpath.py index 6ca58875ac1..e53497b84fb 100644 --- a/build_files/build_environment/darwin/set_rpath.py +++ b/build_files/build_environment/darwin/set_rpath.py @@ -6,6 +6,7 @@ import re import subprocess import sys + # Strip version numbers from dependenciesm macOS notarizatiom fails # with version symlinks. def strip_lib_version(name): @@ -14,6 +15,7 @@ def strip_lib_version(name): name = re.sub(r'(\.[0-9]+)+.cpython', '.cpython', name) return name + rpath = sys.argv[1] file = sys.argv[2] diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py index 4822370c9ea..592eaf57a97 100644 --- a/release/scripts/startup/bl_ui/__init__.py +++ b/release/scripts/startup/bl_ui/__init__.py @@ -94,6 +94,7 @@ _namespace = globals() _modules_loaded = [_namespace[name] for name in _modules] del _namespace + def _addon_support_items(): """Return the addon support levels suitable for this Blender build.""" @@ -105,6 +106,7 @@ def _addon_support_items(): items.append(('TESTING', "Testing", "Newly contributed scripts (excluded from release builds)")) return items + def register(): from bpy.utils import register_class for mod in _modules_loaded: diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index 4acaa7b05e1..5c878486c68 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -520,7 +520,7 @@ typedef struct SculptAttribute { * This will be true if simple_array is requested in * SculptAttributeParams, or the PBVH type is PBVH_GRIDS or PBVH_BMESH. */ - bool simple_array; + bool simple_array; /* Data stored per BMesh element. */ int bmesh_cd_offset; diff --git a/source/blender/blenkernel/intern/blendfile_link_append.c b/source/blender/blenkernel/intern/blendfile_link_append.c index ea68e939e5a..409ae39f6be 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.c +++ b/source/blender/blenkernel/intern/blendfile_link_append.c @@ -996,14 +996,13 @@ static void blendfile_link_append_proxies_convert(Main *bmain, ReportList *repor if (bf_reports.count.proxies_to_lib_overrides_success != 0 || bf_reports.count.proxies_to_lib_overrides_failures != 0) { - BKE_reportf( - bf_reports.reports, - RPT_WARNING, - "Proxies have been removed from Blender (%d proxies were automatically converted " - "to library overrides, %d proxies could not be converted and were cleared). " - "Consider re-saving any library .blend file with the newest Blender version", - bf_reports.count.proxies_to_lib_overrides_success, - bf_reports.count.proxies_to_lib_overrides_failures); + BKE_reportf(bf_reports.reports, + RPT_WARNING, + "Proxies have been removed from Blender (%d proxies were automatically converted " + "to library overrides, %d proxies could not be converted and were cleared). " + "Consider re-saving any library .blend file with the newest Blender version", + bf_reports.count.proxies_to_lib_overrides_success, + bf_reports.count.proxies_to_lib_overrides_failures); } } diff --git a/source/blender/draw/engines/image/image_private.hh b/source/blender/draw/engines/image/image_private.hh index 7fa58f43d06..8241b7e288e 100644 --- a/source/blender/draw/engines/image/image_private.hh +++ b/source/blender/draw/engines/image/image_private.hh @@ -34,7 +34,6 @@ struct IMAGE_Data { IMAGE_InstanceData *instance_data; }; - /** * Abstract class for a drawing mode of the image engine. * diff --git a/source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert_no_geom.glsl b/source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert_no_geom.glsl index 8f21b55fa18..e2eabfa5b9e 100644 --- a/source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert_no_geom.glsl +++ b/source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert_no_geom.glsl @@ -97,9 +97,10 @@ void main() #endif if (!is_manifold || !backface) { - bool do_front = (output_triangle_id==0)?true:false; - emit_cap(do_front, invert, output_vertex_id%3); - } else { + bool do_front = (output_triangle_id == 0) ? true : false; + emit_cap(do_front, invert, output_vertex_id % 3); + } + else { DISCARD_VERTEX } } diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h index 169937d17e2..206c1830617 100644 --- a/source/blender/editors/transform/transform.h +++ b/source/blender/editors/transform/transform.h @@ -23,7 +23,6 @@ extern "C" { #endif - /* -------------------------------------------------------------------- */ /** \name Types/ * \{ */ diff --git a/source/blender/gpu/metal/mtl_context.mm b/source/blender/gpu/metal/mtl_context.mm index 9e03f926787..16530fcfeed 100644 --- a/source/blender/gpu/metal/mtl_context.mm +++ b/source/blender/gpu/metal/mtl_context.mm @@ -1596,17 +1596,14 @@ id<MTLSamplerState> MTLContext::generate_sampler_from_state(MTLSamplerState samp MTLSamplerAddressModeClampToBorderColor : MTLSamplerAddressModeClampToEdge; MTLSamplerAddressMode repeat_type = (sampler_state.state & GPU_SAMPLER_MIRROR_REPEAT) ? - MTLSamplerAddressModeMirrorRepeat : - MTLSamplerAddressModeRepeat; - descriptor.rAddressMode = (sampler_state.state & GPU_SAMPLER_REPEAT_R) ? - repeat_type : - clamp_type; - descriptor.sAddressMode = (sampler_state.state & GPU_SAMPLER_REPEAT_S) ? - repeat_type : - clamp_type; - descriptor.tAddressMode = (sampler_state.state & GPU_SAMPLER_REPEAT_T) ? - repeat_type : - clamp_type; + MTLSamplerAddressModeMirrorRepeat : + MTLSamplerAddressModeRepeat; + descriptor.rAddressMode = (sampler_state.state & GPU_SAMPLER_REPEAT_R) ? repeat_type : + clamp_type; + descriptor.sAddressMode = (sampler_state.state & GPU_SAMPLER_REPEAT_S) ? repeat_type : + clamp_type; + descriptor.tAddressMode = (sampler_state.state & GPU_SAMPLER_REPEAT_T) ? repeat_type : + clamp_type; descriptor.borderColor = MTLSamplerBorderColorTransparentBlack; descriptor.minFilter = (sampler_state.state & GPU_SAMPLER_FILTER) ? MTLSamplerMinMagFilterLinear : diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index d9186021eb0..6d74fd7eab8 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -3509,10 +3509,9 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna) prop = RNA_def_property(srna, "use_object_instances", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "calculation_flags", LRT_ALLOW_DUPLI_OBJECTS); - RNA_def_property_ui_text( - prop, - "Instanced Objects", - "Allow particle objects and face/vertex instances to show in line art"); + RNA_def_property_ui_text(prop, + "Instanced Objects", + "Allow particle objects and face/vertex instances to show in line art"); RNA_def_property_update(prop, NC_SCENE, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "use_edge_overlap", PROP_BOOLEAN, PROP_NONE); @@ -3893,11 +3892,12 @@ static void rna_def_modifier_gpencillineart(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); prop = RNA_def_property(srna, "shadow_camera_size", PROP_FLOAT, PROP_NONE); - RNA_def_property_ui_text(prop, - "Shadow Camera Size", - "Represents the \"Orthographic Scale\" of an orthographic camera. " - "If the camera is positioned at the light's location with this scale, it will " - "represent the coverage of the shadow \"camera\""); + RNA_def_property_ui_text( + prop, + "Shadow Camera Size", + "Represents the \"Orthographic Scale\" of an orthographic camera. " + "If the camera is positioned at the light's location with this scale, it will " + "represent the coverage of the shadow \"camera\""); RNA_def_property_ui_range(prop, 0.0f, 500.0f, 0.1f, 2); RNA_def_property_range(prop, 0.0f, 10000.0f); diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index 42d85d2d3bf..7931d7681f6 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -435,7 +435,8 @@ static void rna_def_layer_collection(BlenderRNA *brna) prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_string_sdna(prop, NULL, "collection->id.name"); RNA_def_property_clear_flag(prop, PROP_EDITABLE | PROP_ANIMATABLE); - RNA_def_property_ui_text(prop, "Name", "Name of this layer collection (same as its collection one)"); + RNA_def_property_ui_text( + prop, "Name", "Name of this layer collection (same as its collection one)"); RNA_def_property_string_funcs( prop, "rna_LayerCollection_name_get", "rna_LayerCollection_name_length", NULL); RNA_def_struct_name_property(srna, prop); diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index 8caedfd248c..8a24aa113b7 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs