archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: format

Browse Source
This commit is contained in:
Campbell Barton
2022-08-04 07:41:03 +10:00
parent cc1daa9b76
commit 1ec7f75b2a
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/mesh_tessellate.cc
View File

@@ -282,7 +282,8 @@ static void mesh_recalc_looptri__multi_threaded(const MLoop *mloop,
{ {
struct TessellationUserTLS tls_data_dummy = {nullptr}; struct TessellationUserTLS tls_data_dummy = {nullptr};
struct TessellationUserData data {}; struct TessellationUserData data {
};
data.mloop = mloop; data.mloop = mloop;
data.mpoly = mpoly; data.mpoly = mpoly;
data.mvert = mvert; data.mvert = mvert;

3
source/blender/blenloader/intern/readfile.c
View File

@@ -359,8 +359,7 @@ static void oldnewmap_insert(OldNewMap *onm, const void *oldaddr, void *newaddr,
oldnewmap_insert_or_replace(onm, entry); oldnewmap_insert_or_replace(onm, entry);
} }
static void oldnewmap_lib_insert( static void oldnewmap_lib_insert(FileData *fd, const void *oldaddr, ID *newaddr, int nr)
FileData *fd, const void *oldaddr, ID *newaddr, int nr)
{ {
oldnewmap_insert(fd->libmap, oldaddr, newaddr, nr); oldnewmap_insert(fd->libmap, oldaddr, newaddr, nr);
} }

3
source/blender/editors/space_image/image_buttons.c
View File

@@ -1213,8 +1213,7 @@ void uiTemplateImageInfo(uiLayout *layout, bContext *C, Image *ima, ImageUser *i
eGPUTextureFormat texture_format = IMB_gpu_get_texture_format(ibuf, eGPUTextureFormat texture_format = IMB_gpu_get_texture_format(ibuf,
ima->flag & IMA_HIGH_BITDEPTH); ima->flag & IMA_HIGH_BITDEPTH);
const char *texture_format_description = GPU_texture_format_description( const char *texture_format_description = GPU_texture_format_description(texture_format);
texture_format);
ofs += BLI_snprintf_rlen(str + ofs, len - ofs, TIP_(", %s"), texture_format_description); ofs += BLI_snprintf_rlen(str + ofs, len - ofs, TIP_(", %s"), texture_format_description);
uiItemL(col, str, ICON_NONE); uiItemL(col, str, ICON_NONE);

2
tests/python/eevee_render_tests.py
View File

@@ -99,6 +99,7 @@ if inside_blender:
print(e) print(e)
sys.exit(1) sys.exit(1)
def get_gpu_device_type(blender): def get_gpu_device_type(blender):
command = [ command = [
blender, blender,
@@ -119,7 +120,6 @@ def get_gpu_device_type(blender):
return None return None
def get_arguments(filepath, output_filepath): def get_arguments(filepath, output_filepath):
return [ return [
"--background", "--background",

6
tests/python/modules/render_report.py
View File

@@ -354,7 +354,8 @@ class Report:
name = test_get_name(filepath) name = test_get_name(filepath)
name = name.replace('_', ' ') 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 "" status = error if error else ""
tr_style = """ class="table-danger" """ if error else "" tr_style = """ class="table-danger" """ if error else ""
@@ -401,7 +402,8 @@ class Report:
self.compare_tests += test_html self.compare_tests += test_html
def _diff_output(self, filepath, tmp_filepath): 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. # Create reference render directory.
old_dirpath = os.path.dirname(old_img) old_dirpath = os.path.dirname(old_img)