Commit: bbc18673f39490666f6cd1e23bcf11b1adb15133 Author: Jacques Lucke Date: Thu Feb 2 13:12:45 2023 +0100 Branches: master https://developer.blender.org/rBbbc18673f39490666f6cd1e23bcf11b1adb15133
Cleanup: make format =================================================================== M source/blender/blenkernel/intern/writeffmpeg.c M source/blender/gpu/tests/shaders/gpu_compute_1d_test.glsl M source/blender/gpu/tests/shaders/gpu_compute_2d_test.glsl M source/blender/gpu/tests/shaders/gpu_compute_dummy_test.glsl M source/blender/gpu/tests/shaders/gpu_compute_ibo_test.glsl M source/blender/gpu/tests/shaders/gpu_compute_vbo_test.glsl M tests/python/bl_usd_import_test.py =================================================================== diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index 3b402730ee9..afb9f530d8e 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -480,7 +480,7 @@ static const AVCodec *get_av1_encoder( * where using a different encoder is desireable, such as in T103849. */ codec = avcodec_find_encoder_by_name("librav1e"); if (!codec) { - /* Fallback to libaom-av1 if librav1e is not found. */ + /* Fallback to libaom-av1 if librav1e is not found. */ codec = avcodec_find_encoder_by_name("libaom-av1"); } break; diff --git a/source/blender/gpu/tests/shaders/gpu_compute_1d_test.glsl b/source/blender/gpu/tests/shaders/gpu_compute_1d_test.glsl index f3b85669b9c..9881f752eb9 100644 --- a/source/blender/gpu/tests/shaders/gpu_compute_1d_test.glsl +++ b/source/blender/gpu/tests/shaders/gpu_compute_1d_test.glsl @@ -1,4 +1,5 @@ -void main() { +void main() +{ int index = int(gl_GlobalInvocationID.x); vec4 pos = vec4(gl_GlobalInvocationID.x); imageStore(img_output, index, pos); diff --git a/source/blender/gpu/tests/shaders/gpu_compute_2d_test.glsl b/source/blender/gpu/tests/shaders/gpu_compute_2d_test.glsl index 698a256e88e..cbc598e4ceb 100644 --- a/source/blender/gpu/tests/shaders/gpu_compute_2d_test.glsl +++ b/source/blender/gpu/tests/shaders/gpu_compute_2d_test.glsl @@ -1,4 +1,5 @@ -void main() { +void main() +{ vec4 pixel = vec4(1.0, 0.5, 0.2, 1.0); imageStore(img_output, ivec2(gl_GlobalInvocationID.xy), pixel); } diff --git a/source/blender/gpu/tests/shaders/gpu_compute_dummy_test.glsl b/source/blender/gpu/tests/shaders/gpu_compute_dummy_test.glsl index 0b2c54c4153..919810306a4 100644 --- a/source/blender/gpu/tests/shaders/gpu_compute_dummy_test.glsl +++ b/source/blender/gpu/tests/shaders/gpu_compute_dummy_test.glsl @@ -1,2 +1,3 @@ -void main () { +void main() +{ } diff --git a/source/blender/gpu/tests/shaders/gpu_compute_ibo_test.glsl b/source/blender/gpu/tests/shaders/gpu_compute_ibo_test.glsl index ad1ed1b42db..94c281720b9 100644 --- a/source/blender/gpu/tests/shaders/gpu_compute_ibo_test.glsl +++ b/source/blender/gpu/tests/shaders/gpu_compute_ibo_test.glsl @@ -1,4 +1,5 @@ -void main() { +void main() +{ uint store_index = int(gl_GlobalInvocationID.x); out_indices[store_index] = store_index; } diff --git a/source/blender/gpu/tests/shaders/gpu_compute_vbo_test.glsl b/source/blender/gpu/tests/shaders/gpu_compute_vbo_test.glsl index 72f7f9326bb..e8d2eb9201b 100644 --- a/source/blender/gpu/tests/shaders/gpu_compute_vbo_test.glsl +++ b/source/blender/gpu/tests/shaders/gpu_compute_vbo_test.glsl @@ -1,4 +1,5 @@ -void main() { +void main() +{ uint index = gl_GlobalInvocationID.x; vec4 pos = vec4(gl_GlobalInvocationID.x); out_positions[index] = pos; diff --git a/tests/python/bl_usd_import_test.py b/tests/python/bl_usd_import_test.py index 438a5c48d73..e05b32cf0e8 100644 --- a/tests/python/bl_usd_import_test.py +++ b/tests/python/bl_usd_import_test.py @@ -189,6 +189,7 @@ class USDImportTest(AbstractUSDTest): self.assertAlmostEqual(1.234, test_cam.shift_x, 3) self.assertAlmostEqual(5.678, test_cam.shift_y, 3) + def main(): global args import argparse _______________________________________________ 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