Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-08-04 00:41:03 +0300
committerCampbell Barton <campbell@blender.org>2022-08-04 00:41:03 +0300
commit1ec7f75b2a045c176218c694ae24e018f0802dbe (patch)
treec8529f82c63a85962e04f4c73eb095e52bc6e908
parentcc1daa9b766debbd79c1e6246f73a324039fc244 (diff)
Cleanup: format
-rw-r--r--source/blender/blenkernel/intern/mesh_tessellate.cc3
-rw-r--r--source/blender/blenloader/intern/readfile.c3
-rw-r--r--source/blender/editors/space_image/image_buttons.c3
-rw-r--r--tests/python/eevee_render_tests.py2
-rw-r--r--tests/python/gpu_info.py4
-rwxr-xr-xtests/python/modules/render_report.py6
6 files changed, 11 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/mesh_tessellate.cc b/source/blender/blenkernel/intern/mesh_tessellate.cc
index ab0aeb88ebc..de4c60b28db 100644
--- a/source/blender/blenkernel/intern/mesh_tessellate.cc
+++ b/source/blender/blenkernel/intern/mesh_tessellate.cc
@@ -282,7 +282,8 @@ static void mesh_recalc_looptri__multi_threaded(const MLoop *mloop,
{
struct TessellationUserTLS tls_data_dummy = {nullptr};
- struct TessellationUserData data {};
+ struct TessellationUserData data {
+ };
data.mloop = mloop;
data.mpoly = mpoly;
data.mvert = mvert;
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 6fad67eb217..b880f0513b8 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -359,8 +359,7 @@ static void oldnewmap_insert(OldNewMap *onm, const void *oldaddr, void *newaddr,
oldnewmap_insert_or_replace(onm, entry);
}
-static void oldnewmap_lib_insert(
- FileData *fd, const void *oldaddr, ID *newaddr, int nr)
+static void oldnewmap_lib_insert(FileData *fd, const void *oldaddr, ID *newaddr, int nr)
{
oldnewmap_insert(fd->libmap, oldaddr, newaddr, nr);
}
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index baaa521fc94..48f43e05315 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -1213,8 +1213,7 @@ void uiTemplateImageInfo(uiLayout *layout, bContext *C, Image *ima, ImageUser *i
eGPUTextureFormat texture_format = IMB_gpu_get_texture_format(ibuf,
ima->flag & IMA_HIGH_BITDEPTH);
- const char *texture_format_description = GPU_texture_format_description(
- texture_format);
+ const char *texture_format_description = GPU_texture_format_description(texture_format);
ofs += BLI_snprintf_rlen(str + ofs, len - ofs, TIP_(", %s"), texture_format_description);
uiItemL(col, str, ICON_NONE);
diff --git a/tests/python/eevee_render_tests.py b/tests/python/eevee_render_tests.py
index 34c15872a11..9ed850fcb52 100644
--- a/tests/python/eevee_render_tests.py
+++ b/tests/python/eevee_render_tests.py
@@ -99,6 +99,7 @@ if inside_blender:
print(e)
sys.exit(1)
+
def get_gpu_device_type(blender):
command = [
blender,
@@ -119,7 +120,6 @@ def get_gpu_device_type(blender):
return None
-
def get_arguments(filepath, output_filepath):
return [
"--background",
diff --git a/tests/python/gpu_info.py b/tests/python/gpu_info.py
index 1df23d68000..518fdc98bcc 100644
--- a/tests/python/gpu_info.py
+++ b/tests/python/gpu_info.py
@@ -7,7 +7,7 @@ import bpy
import gpu
import sys
-# Render with workbench to initialize the GPU backend otherwise it would fail when running in
+# Render with workbench to initialize the GPU backend otherwise it would fail when running in
# background mode as the GPU backend won't be initialized.
scene = bpy.context.scene
scene.render.resolution_x = 1
@@ -21,4 +21,4 @@ print('GPU_RENDERER:' + gpu.platform.renderer_get())
print('GPU_VERSION:' + gpu.platform.version_get())
print('GPU_DEVICE_TYPE:' + gpu.platform.device_type_get())
-sys.exit(0) \ No newline at end of file
+sys.exit(0)
diff --git a/tests/python/modules/render_report.py b/tests/python/modules/render_report.py
index 52f388586d8..15d46d6d127 100755
--- a/tests/python/modules/render_report.py
+++ b/tests/python/modules/render_report.py
@@ -354,7 +354,8 @@ class Report:
name = test_get_name(filepath)
name = name.replace('_', ' ')
- old_img, ref_img, new_img, diff_img = test_get_images(self.output_dir, filepath, self.reference_dir, self.reference_override_dir)
+ old_img, ref_img, new_img, diff_img = test_get_images(
+ self.output_dir, filepath, self.reference_dir, self.reference_override_dir)
status = error if error else ""
tr_style = """ class="table-danger" """ if error else ""
@@ -401,7 +402,8 @@ class Report:
self.compare_tests += test_html
def _diff_output(self, filepath, tmp_filepath):
- old_img, ref_img, new_img, diff_img = test_get_images(self.output_dir, filepath, self.reference_dir, self.reference_override_dir)
+ old_img, ref_img, new_img, diff_img = test_get_images(
+ self.output_dir, filepath, self.reference_dir, self.reference_override_dir)
# Create reference render directory.
old_dirpath = os.path.dirname(old_img)