diff --git a/build_files/build_environment/cmake/dpcpp.cmake b/build_files/build_environment/cmake/dpcpp.cmake index ef6fc9c40c9..ae30d842af4 100644 --- a/build_files/build_environment/cmake/dpcpp.cmake +++ b/build_files/build_environment/cmake/dpcpp.cmake @@ -2,7 +2,7 @@ # LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with # MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms -# for now. +# for now. string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " DPCPP_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}") if(WIN32) diff --git a/build_files/build_environment/cmake/llvm.cmake b/build_files/build_environment/cmake/llvm.cmake index 26e1f1f58b4..8994d330bbe 100644 --- a/build_files/build_environment/cmake/llvm.cmake +++ b/build_files/build_environment/cmake/llvm.cmake @@ -42,7 +42,7 @@ endif() # LLVM does not switch over to cpp17 until llvm 16 and building ealier versions with # MSVC is leading to some crashes in ISPC. Switch back to their default on all platforms -# for now. +# for now. string(REPLACE "-DCMAKE_CXX_STANDARD=17" " " LLVM_CMAKE_FLAGS "${DEFAULT_CMAKE_FLAGS}") # short project name due to long filename issues on windows diff --git a/build_files/build_environment/cmake/ssl.cmake b/build_files/build_environment/cmake/ssl.cmake index 6241e2d44e6..31792e788df 100644 --- a/build_files/build_environment/cmake/ssl.cmake +++ b/build_files/build_environment/cmake/ssl.cmake @@ -10,9 +10,9 @@ if(WIN32) DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH ${SSL_HASH_TYPE}=${SSL_HASH} PREFIX ${BUILD_DIR}/ssl - CONFIGURE_COMMAND echo "." - BUILD_COMMAND echo "." - INSTALL_COMMAND echo "." + CONFIGURE_COMMAND echo "." + BUILD_COMMAND echo "." + INSTALL_COMMAND echo "." INSTALL_DIR ${LIBDIR}/ssl ) else() @@ -46,4 +46,4 @@ else() INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install INSTALL_DIR ${LIBDIR}/ssl ) -endif() \ No newline at end of file +endif() diff --git a/build_files/build_environment/cmake/xml2.cmake b/build_files/build_environment/cmake/xml2.cmake index 3d31ec131bb..e403ad41a5e 100644 --- a/build_files/build_environment/cmake/xml2.cmake +++ b/build_files/build_environment/cmake/xml2.cmake @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0-or-later if(WIN32) - set(XML2_EXTRA_ARGS + set(XML2_EXTRA_ARGS -DLIBXML2_WITH_ZLIB=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_PYTHON=OFF diff --git a/intern/cycles/kernel/device/metal/context_begin.h b/intern/cycles/kernel/device/metal/context_begin.h index 4bde9be455a..60d7e36589c 100644 --- a/intern/cycles/kernel/device/metal/context_begin.h +++ b/intern/cycles/kernel/device/metal/context_begin.h @@ -34,7 +34,7 @@ class MetalKernelContext { kernel_assert(0); return 0; } - + #ifdef __KERNEL_METAL_INTEL__ template inline __attribute__((__always_inline__)) @@ -55,7 +55,7 @@ class MetalKernelContext { } } #endif - + // texture2d template<> inline __attribute__((__always_inline__)) diff --git a/make.bat b/make.bat index 394b2d0dad5..239be60ebf0 100644 --- a/make.bat +++ b/make.bat @@ -69,7 +69,7 @@ if "%BUILD_UPDATE%" == "1" ( REM Then update SVN platform libraries, since updating python while python is REM running tends to be problematic. The python script that update_sources REM calls later on may still try to switch branches and run into trouble, - REM but for *most* people this will side step the problem. + REM but for *most* people this will side step the problem. call "%BLENDER_DIR%\build_files\windows\svn_update.cmd" ) REM Finally call the python script shared between all platforms that updates git diff --git a/source/blender/blenlib/BLI_vector_list.hh b/source/blender/blenlib/BLI_vector_list.hh index dee333db39a..533d9efc421 100644 --- a/source/blender/blenlib/BLI_vector_list.hh +++ b/source/blender/blenlib/BLI_vector_list.hh @@ -117,4 +117,4 @@ class VectorList { } }; -} // namespace blender \ No newline at end of file +} // namespace blender diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 4d7d537b450..c229fb10200 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -340,4 +340,4 @@ void DEG_disable_visibility_optimization(struct Depsgraph *depsgraph) { deg::Depsgraph *deg_graph = reinterpret_cast(depsgraph); deg_graph->use_visibility_optimization = false; -} \ No newline at end of file +} diff --git a/source/blender/draw/engines/eevee/shaders/effect_reflection_lib.glsl b/source/blender/draw/engines/eevee/shaders/effect_reflection_lib.glsl index 7097d56fe54..a050a9fdfc9 100644 --- a/source/blender/draw/engines/eevee/shaders/effect_reflection_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/effect_reflection_lib.glsl @@ -47,4 +47,4 @@ HitData decode_hit_data(vec4 hit_data, float hit_depth) /* Blue noise categorized into 4 sets of samples. * See "Stochastic all the things" presentation slide 32-37. */ -#define resolve_samples_count 9 \ No newline at end of file +#define resolve_samples_count 9 diff --git a/source/blender/gpu/metal/mtl_shader_interface_type.hh b/source/blender/gpu/metal/mtl_shader_interface_type.hh index 1ae429c55bc..1984f2765eb 100644 --- a/source/blender/gpu/metal/mtl_shader_interface_type.hh +++ b/source/blender/gpu/metal/mtl_shader_interface_type.hh @@ -271,4 +271,4 @@ inline eMTLDataType gpu_type_to_mtl_type(eGPUType type) return MTL_DATATYPE_FLOAT; } return MTL_DATATYPE_FLOAT; -} \ No newline at end of file +} 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 43832b9f16d..f3b85669b9c 100644 --- a/source/blender/gpu/tests/shaders/gpu_compute_1d_test.glsl +++ b/source/blender/gpu/tests/shaders/gpu_compute_1d_test.glsl @@ -2,4 +2,4 @@ void main() { int index = int(gl_GlobalInvocationID.x); vec4 pos = vec4(gl_GlobalInvocationID.x); imageStore(img_output, index, pos); -} \ No newline at end of file +} 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 a43933151d8..698a256e88e 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,4 @@ void main() { vec4 pixel = vec4(1.0, 0.5, 0.2, 1.0); imageStore(img_output, ivec2(gl_GlobalInvocationID.xy), pixel); -} \ No newline at end of file +} 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 c08e5bcfebe..0b2c54c4153 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,2 @@ void main () { -} \ No newline at end of file +} 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 965d59c7490..ad1ed1b42db 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,4 @@ void main() { uint store_index = int(gl_GlobalInvocationID.x); out_indices[store_index] = store_index; -} \ No newline at end of file +} 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 147ef09d004..72f7f9326bb 100644 --- a/source/blender/gpu/tests/shaders/gpu_compute_vbo_test.glsl +++ b/source/blender/gpu/tests/shaders/gpu_compute_vbo_test.glsl @@ -2,4 +2,4 @@ void main() { uint index = gl_GlobalInvocationID.x; vec4 pos = vec4(gl_GlobalInvocationID.x); out_positions[index] = pos; -} \ No newline at end of file +} diff --git a/source/blender/gpu/vulkan/vk_backend.cc b/source/blender/gpu/vulkan/vk_backend.cc index b402ef2f503..592f5422dca 100644 --- a/source/blender/gpu/vulkan/vk_backend.cc +++ b/source/blender/gpu/vulkan/vk_backend.cc @@ -159,4 +159,4 @@ void VKBackend::capabilities_init(VKContext &context) GCaps.shader_image_load_store_support = true; } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_backend.hh b/source/blender/gpu/vulkan/vk_backend.hh index 4c6312ed682..f51798eb9c0 100644 --- a/source/blender/gpu/vulkan/vk_backend.hh +++ b/source/blender/gpu/vulkan/vk_backend.hh @@ -71,4 +71,4 @@ class VKBackend : public GPUBackend { static void platform_exit(); }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_batch.cc b/source/blender/gpu/vulkan/vk_batch.cc index a25f98a2e24..bdcf626864b 100644 --- a/source/blender/gpu/vulkan/vk_batch.cc +++ b/source/blender/gpu/vulkan/vk_batch.cc @@ -24,4 +24,4 @@ void VKBatch::multi_draw_indirect(GPUStorageBuf * /*indirect_buf*/, { } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_batch.hh b/source/blender/gpu/vulkan/vk_batch.hh index 0f6df41606d..5b34f7119cf 100644 --- a/source/blender/gpu/vulkan/vk_batch.hh +++ b/source/blender/gpu/vulkan/vk_batch.hh @@ -21,4 +21,4 @@ class VKBatch : public Batch { intptr_t stride) override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_context.cc b/source/blender/gpu/vulkan/vk_context.cc index 6013b5eb95c..d4e1456900c 100644 --- a/source/blender/gpu/vulkan/vk_context.cc +++ b/source/blender/gpu/vulkan/vk_context.cc @@ -79,4 +79,4 @@ void VKContext::debug_group_end() { } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_context.hh b/source/blender/gpu/vulkan/vk_context.hh index 56d39169538..6a5b5cb0034 100644 --- a/source/blender/gpu/vulkan/vk_context.hh +++ b/source/blender/gpu/vulkan/vk_context.hh @@ -63,4 +63,4 @@ class VKContext : public Context { } }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_drawlist.cc b/source/blender/gpu/vulkan/vk_drawlist.cc index c8f3c736bb8..3b699bb9ec4 100644 --- a/source/blender/gpu/vulkan/vk_drawlist.cc +++ b/source/blender/gpu/vulkan/vk_drawlist.cc @@ -17,4 +17,4 @@ void VKDrawList::submit() { } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_drawlist.hh b/source/blender/gpu/vulkan/vk_drawlist.hh index 4707bf4bb26..539f494e9bb 100644 --- a/source/blender/gpu/vulkan/vk_drawlist.hh +++ b/source/blender/gpu/vulkan/vk_drawlist.hh @@ -17,4 +17,4 @@ class VKDrawList : public DrawList { void submit() override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_fence.cc b/source/blender/gpu/vulkan/vk_fence.cc index 3acd94d3050..277daa5ef0d 100644 --- a/source/blender/gpu/vulkan/vk_fence.cc +++ b/source/blender/gpu/vulkan/vk_fence.cc @@ -17,4 +17,4 @@ void VKFence::wait() { } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_fence.hh b/source/blender/gpu/vulkan/vk_fence.hh index ff382ae54e3..795618a3dc0 100644 --- a/source/blender/gpu/vulkan/vk_fence.hh +++ b/source/blender/gpu/vulkan/vk_fence.hh @@ -17,4 +17,4 @@ class VKFence : public Fence { void wait() override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_framebuffer.cc b/source/blender/gpu/vulkan/vk_framebuffer.cc index 48b0685bf38..e0affa22f25 100644 --- a/source/blender/gpu/vulkan/vk_framebuffer.cc +++ b/source/blender/gpu/vulkan/vk_framebuffer.cc @@ -59,4 +59,4 @@ void VKFrameBuffer::blit_to(eGPUFrameBufferBits /*planes*/, { } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_framebuffer.hh b/source/blender/gpu/vulkan/vk_framebuffer.hh index 632d45ce709..973211f83a8 100644 --- a/source/blender/gpu/vulkan/vk_framebuffer.hh +++ b/source/blender/gpu/vulkan/vk_framebuffer.hh @@ -47,4 +47,4 @@ class VKFrameBuffer : public FrameBuffer { int dst_offset_y) override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_index_buffer.cc b/source/blender/gpu/vulkan/vk_index_buffer.cc index 119a617a159..ca3ce48dc64 100644 --- a/source/blender/gpu/vulkan/vk_index_buffer.cc +++ b/source/blender/gpu/vulkan/vk_index_buffer.cc @@ -30,4 +30,4 @@ void VKIndexBuffer::strip_restart_indices() { } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_index_buffer.hh b/source/blender/gpu/vulkan/vk_index_buffer.hh index f002d5581c7..94a584086e0 100644 --- a/source/blender/gpu/vulkan/vk_index_buffer.hh +++ b/source/blender/gpu/vulkan/vk_index_buffer.hh @@ -25,4 +25,4 @@ class VKIndexBuffer : public IndexBuf { void strip_restart_indices() override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_pixel_buffer.cc b/source/blender/gpu/vulkan/vk_pixel_buffer.cc index 177f19d8acd..609c6ec68a8 100644 --- a/source/blender/gpu/vulkan/vk_pixel_buffer.cc +++ b/source/blender/gpu/vulkan/vk_pixel_buffer.cc @@ -32,4 +32,4 @@ uint VKPixelBuffer::get_size() return size_; } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_pixel_buffer.hh b/source/blender/gpu/vulkan/vk_pixel_buffer.hh index 8ba8243428f..7ea1529fd46 100644 --- a/source/blender/gpu/vulkan/vk_pixel_buffer.hh +++ b/source/blender/gpu/vulkan/vk_pixel_buffer.hh @@ -20,4 +20,4 @@ class VKPixelBuffer : public PixelBuffer { uint get_size() override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_query.cc b/source/blender/gpu/vulkan/vk_query.cc index e24fe54e5d0..8d2ae38b92e 100644 --- a/source/blender/gpu/vulkan/vk_query.cc +++ b/source/blender/gpu/vulkan/vk_query.cc @@ -25,4 +25,4 @@ void VKQueryPool::get_occlusion_result(MutableSpan /*r_values*/) { } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_query.hh b/source/blender/gpu/vulkan/vk_query.hh index 36558ef9549..6213b9af2bd 100644 --- a/source/blender/gpu/vulkan/vk_query.hh +++ b/source/blender/gpu/vulkan/vk_query.hh @@ -19,4 +19,4 @@ class VKQueryPool : public QueryPool { void get_occlusion_result(MutableSpan r_values) override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_shader.cc b/source/blender/gpu/vulkan/vk_shader.cc index cf05cf13d23..5e7e7440624 100644 --- a/source/blender/gpu/vulkan/vk_shader.cc +++ b/source/blender/gpu/vulkan/vk_shader.cc @@ -940,4 +940,4 @@ int VKShader::program_handle_get() const return -1; } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_shader.hh b/source/blender/gpu/vulkan/vk_shader.hh index aa8f0b84ae7..2fca185ea93 100644 --- a/source/blender/gpu/vulkan/vk_shader.hh +++ b/source/blender/gpu/vulkan/vk_shader.hh @@ -65,4 +65,4 @@ class VKShader : public Shader { VkShaderModule *r_shader_module); }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_shader_log.hh b/source/blender/gpu/vulkan/vk_shader_log.hh index fb12b7a5039..d668663f00b 100644 --- a/source/blender/gpu/vulkan/vk_shader_log.hh +++ b/source/blender/gpu/vulkan/vk_shader_log.hh @@ -13,4 +13,4 @@ class VKLogParser : public GPULogParser { char *skip_name(char *log_line); char *skip_severity_keyword(char *log_line, GPULogItem &log_item); }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_storage_buffer.hh b/source/blender/gpu/vulkan/vk_storage_buffer.hh index a51f89f627a..ab3cb584ea0 100644 --- a/source/blender/gpu/vulkan/vk_storage_buffer.hh +++ b/source/blender/gpu/vulkan/vk_storage_buffer.hh @@ -27,4 +27,4 @@ class VKStorageBuffer : public StorageBuf { void read(void *data) override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_texture.cc b/source/blender/gpu/vulkan/vk_texture.cc index a6c59ea35af..3215268b7bc 100644 --- a/source/blender/gpu/vulkan/vk_texture.cc +++ b/source/blender/gpu/vulkan/vk_texture.cc @@ -74,4 +74,4 @@ bool VKTexture::init_internal(const GPUTexture * /*src*/, int /*mip_offset*/, in return false; } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_texture.hh b/source/blender/gpu/vulkan/vk_texture.hh index fd38cf403e2..087c4ca8a9a 100644 --- a/source/blender/gpu/vulkan/vk_texture.hh +++ b/source/blender/gpu/vulkan/vk_texture.hh @@ -40,4 +40,4 @@ class VKTexture : public Texture { bool init_internal(const GPUTexture *src, int mip_offset, int layer_offset) override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_uniform_buffer.cc b/source/blender/gpu/vulkan/vk_uniform_buffer.cc index 89bbdc3264f..a5024517ce5 100644 --- a/source/blender/gpu/vulkan/vk_uniform_buffer.cc +++ b/source/blender/gpu/vulkan/vk_uniform_buffer.cc @@ -29,4 +29,4 @@ void VKUniformBuffer::unbind() { } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_uniform_buffer.hh b/source/blender/gpu/vulkan/vk_uniform_buffer.hh index 1a4978782f2..bd5b136f249 100644 --- a/source/blender/gpu/vulkan/vk_uniform_buffer.hh +++ b/source/blender/gpu/vulkan/vk_uniform_buffer.hh @@ -24,4 +24,4 @@ class VKUniformBuffer : public UniformBuf { void unbind() override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_vertex_buffer.cc b/source/blender/gpu/vulkan/vk_vertex_buffer.cc index 01353acfa46..3931c927499 100644 --- a/source/blender/gpu/vulkan/vk_vertex_buffer.cc +++ b/source/blender/gpu/vulkan/vk_vertex_buffer.cc @@ -70,4 +70,4 @@ void VKVertexBuffer::duplicate_data(VertBuf * /*dst*/) { } -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu diff --git a/source/blender/gpu/vulkan/vk_vertex_buffer.hh b/source/blender/gpu/vulkan/vk_vertex_buffer.hh index 04eb48f9bd0..e4240787138 100644 --- a/source/blender/gpu/vulkan/vk_vertex_buffer.hh +++ b/source/blender/gpu/vulkan/vk_vertex_buffer.hh @@ -31,4 +31,4 @@ class VKVertexBuffer : public VertBuf { void duplicate_data(VertBuf *dst) override; }; -} // namespace blender::gpu \ No newline at end of file +} // namespace blender::gpu