From faaac97239bca129e1b13e5dc747f9ed45f4972e Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 9 Aug 2023 10:46:10 +1000 Subject: [PATCH] Cleanup: format --- doc/python_api/examples/bpy.types.USDHook.py | 7 +++++-- .../blender/compositor/realtime_compositor/CMakeLists.txt | 1 - .../eevee_next/shaders/eevee_bxdf_sampling_lib.glsl | 2 +- .../shaders/eevee_ray_denoise_bilateral_comp.glsl | 2 +- .../eevee_next/shaders/eevee_ray_denoise_spatial_comp.glsl | 2 +- .../shaders/eevee_ray_denoise_temporal_comp.glsl | 2 +- .../eevee_next/shaders/eevee_ray_tile_classify_comp.glsl | 2 +- .../eevee_next/shaders/eevee_ray_tile_compact_comp.glsl | 2 +- .../eevee_reflection_probe_update_irradiance_comp.glsl | 2 +- source/blender/editors/space_console/CMakeLists.txt | 1 - source/blender/editors/space_text/CMakeLists.txt | 1 - source/blender/io/gpencil/CMakeLists.txt | 2 +- source/blender/render/intern/render_types.cc | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/python_api/examples/bpy.types.USDHook.py b/doc/python_api/examples/bpy.types.USDHook.py index d38a853d433..1bff9a9b6c7 100644 --- a/doc/python_api/examples/bpy.types.USDHook.py +++ b/doc/python_api/examples/bpy.types.USDHook.py @@ -48,6 +48,7 @@ import pxr.Sdf as Sdf import pxr.Usd as Usd import pxr.UsdShade as UsdShade + class USDHookExample(bpy.types.USDHook): bl_idname = "usd_hook_example" bl_label = "Example" @@ -97,10 +98,12 @@ class USDHookExample(bpy.types.USDHook): def register(): - bpy.utils.register_class(USDHookExample) + bpy.utils.register_class(USDHookExample) + def unregister(): - bpy.utils.unregister_class(USDHookExample) + bpy.utils.unregister_class(USDHookExample) + if __name__ == "__main__": register() diff --git a/source/blender/compositor/realtime_compositor/CMakeLists.txt b/source/blender/compositor/realtime_compositor/CMakeLists.txt index 2b17e0c6ef9..10a30744b20 100644 --- a/source/blender/compositor/realtime_compositor/CMakeLists.txt +++ b/source/blender/compositor/realtime_compositor/CMakeLists.txt @@ -317,4 +317,3 @@ if(WITH_OPENCOLORIO) endif() blender_add_lib(bf_realtime_compositor "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") - diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_bxdf_sampling_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_bxdf_sampling_lib.glsl index f16ef2fcfe3..6eef54735bc 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_bxdf_sampling_lib.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_bxdf_sampling_lib.glsl @@ -216,4 +216,4 @@ vec3 sample_uniform_cone(vec3 rand, float angle, vec3 N, vec3 T, vec3 B) return tH * mat3(N, T, B); } -/** \} */ \ No newline at end of file +/** \} */ diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_bilateral_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_bilateral_comp.glsl index 28ead2d4c5b..861b8266009 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_bilateral_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_bilateral_comp.glsl @@ -186,4 +186,4 @@ void main() out_radiance = from_accumulation_space(out_radiance); imageStore(out_radiance_img, texel_fullres, vec4(out_radiance, 0.0)); -} \ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_spatial_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_spatial_comp.glsl index 553c5b798f7..868d7f4c539 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_spatial_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_spatial_comp.glsl @@ -230,4 +230,4 @@ void main() imageStore(out_radiance_img, texel_fullres, vec4(radiance_accum, 0.0)); imageStore(out_variance_img, texel_fullres, vec4(hit_variance)); imageStore(out_hit_depth_img, texel_fullres, vec4(hit_depth)); -} \ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_temporal_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_temporal_comp.glsl index e702c408d06..d980ac15e8c 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_temporal_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_denoise_temporal_comp.glsl @@ -209,4 +209,4 @@ void main() float out_variance = mix(in_variance, history_variance.x, mix_variance_fac); /* This is feedback next frame as variance_history_tx. */ imageStore(out_variance_img, texel_fullres, vec4(out_variance)); -} \ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_tile_classify_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_tile_classify_comp.glsl index 1d0b39dc10c..97abbc72948 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_tile_classify_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_tile_classify_comp.glsl @@ -64,4 +64,4 @@ void main() imageStore(tile_mask_img, tile_co, uvec4(tile_mask)); } -} \ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_tile_compact_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_tile_compact_comp.glsl index 47600216ac2..d10decd4207 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_ray_tile_compact_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_ray_tile_compact_comp.glsl @@ -36,4 +36,4 @@ void main() uint tile_index = atomicAdd(ray_dispatch_buf.num_groups_x, 1u); ray_tiles_buf[tile_index] = packUvec2x16(uvec2(tile)); } -} \ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_reflection_probe_update_irradiance_comp.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_reflection_probe_update_irradiance_comp.glsl index 4d7db0d25fa..18898f23300 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_reflection_probe_update_irradiance_comp.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_reflection_probe_update_irradiance_comp.glsl @@ -73,4 +73,4 @@ void main() atlas_store(result[2], atlas_coord, 2); atlas_store(result[3], atlas_coord, 3); } -} \ No newline at end of file +} diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index caa624c7223..ca74b093d4c 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -37,4 +37,3 @@ endif() blender_add_lib(bf_editor_space_console "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") - diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index a0d9caf978a..83c0b7a9c7e 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -51,4 +51,3 @@ endif() blender_add_lib(bf_editor_space_text "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") - diff --git a/source/blender/io/gpencil/CMakeLists.txt b/source/blender/io/gpencil/CMakeLists.txt index f89f875f675..11661c78786 100644 --- a/source/blender/io/gpencil/CMakeLists.txt +++ b/source/blender/io/gpencil/CMakeLists.txt @@ -15,7 +15,7 @@ set(INC ../../windowmanager ../../../../intern/clog ../../../../intern/guardedalloc - ../../../../intern/utfconv + ../../../../intern/utfconv ) set(INC_SYS diff --git a/source/blender/render/intern/render_types.cc b/source/blender/render/intern/render_types.cc index 006d9ce6b45..d39281cd954 100644 --- a/source/blender/render/intern/render_types.cc +++ b/source/blender/render/intern/render_types.cc @@ -39,4 +39,4 @@ Render::~Render() BKE_curvemapping_free_data(&r.mblur_shutter_curve); render_result_free(pushedresult); -} \ No newline at end of file +}