griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: format

Browse Source
This commit is contained in:
Campbell Barton
2022-12-15 09:34:22 +11:00
parent d173a52f56
commit e476afff41
14 changed files with 55 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/build_environment/darwin/set_rpath.py
View File

@@ -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]

2
release/scripts/startup/bl_ui/__init__.py
View File

@@ -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:

2
source/blender/blenkernel/BKE_paint.h
View File

@@ -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;

15
source/blender/blenkernel/intern/blendfile_link_append.c
View File

@@ -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);
}
}

1
source/blender/draw/engines/image/image_private.hh
View File

@@ -34,7 +34,6 @@ struct IMAGE_Data {
IMAGE_InstanceData *instance_data;
};
/**
* Abstract class for a drawing mode of the image engine.
*

7
source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert_no_geom.glsl
View File

@@ -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
}
}

1
source/blender/editors/transform/transform.h
View File

@@ -23,7 +23,6 @@
extern "C" {
#endif
/* -------------------------------------------------------------------- */
/** \name Types/
* \{ */

19
source/blender/gpu/metal/mtl_context.mm
View File

@@ -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 :

18
source/blender/makesrna/intern/rna_gpencil_modifier.c
View File

@@ -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);

3
source/blender/makesrna/intern/rna_layer.c
View File

@@ -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);

9
source/blender/makesrna/intern/rna_object.c
View File

@@ -782,10 +782,11 @@ static void rna_Object_dup_collection_set(PointerRNA *ptr,
}
}
else {
BKE_report(NULL,
RPT_ERROR,
"Cannot set instance-collection as object belongs in collection being instanced, thus "
"causing a cycle");
BKE_report(
NULL,
RPT_ERROR,
"Cannot set instance-collection as object belongs in collection being instanced, thus "
"causing a cycle");
}
}

6
source/blender/makesrna/intern/rna_scene.c
View File

@@ -7821,7 +7821,11 @@ void RNA_def_scene(BlenderRNA *brna)
{3, "LINEAR", 0, "Linear", "Linear distance model"},
{4, "LINEAR_CLAMPED", 0, "Linear Clamped", "Linear distance model with clamping"},
{5, "EXPONENT", 0, "Exponential", "Exponential distance model"},
{6, "EXPONENT_CLAMPED", 0, "Exponential Clamped", "Exponential distance model with clamping"},
{6,
"EXPONENT_CLAMPED",
0,
"Exponential Clamped",
"Exponential distance model with clamping"},
{0, NULL, 0, NULL, NULL},
};

6
source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc
View File

@@ -28,9 +28,9 @@ static void node_declare(NodeDeclarationBuilder &b)
"instancing the entire geometry"));
b.add_input<decl::Int>(N_("Instance Index"))
.implicit_field(implicit_field_inputs::id_or_index)
.description(N_(
"Index of the instance used for each point. This is only used when Pick Instances "
"is on. By default the point index is used"));
.description(
N_("Index of the instance used for each point. This is only used when Pick Instances "
"is on. By default the point index is used"));
b.add_input<decl::Vector>(N_("Rotation"))
.subtype(PROP_EULER)
.supports_field()

15
source/blender/windowmanager/intern/wm_files.c
View File

@@ -891,14 +891,13 @@ static void file_read_reports_finalize(BlendFileReadReport *bf_reports)
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);
}
if (bf_reports->count.sequence_strips_skipped != 0) {