diff options
22 files changed, 19 insertions, 25 deletions
diff --git a/build_files/cmake/platform/platform_win32_bundle_crt.cmake b/build_files/cmake/platform/platform_win32_bundle_crt.cmake index e84a139fac9..abadaa112a2 100644 --- a/build_files/cmake/platform/platform_win32_bundle_crt.cmake +++ b/build_files/cmake/platform/platform_win32_bundle_crt.cmake @@ -33,7 +33,3 @@ if(WITH_WINDOWS_BUNDLE_CRT) set(BUNDLECRT "<dependency><dependentAssembly><assemblyIdentity type=\"win32\" name=\"blender.crt\" version=\"1.0.0.0\" /></dependentAssembly></dependency>") endif() configure_file(${CMAKE_SOURCE_DIR}/release/windows/manifest/blender.exe.manifest.in ${CMAKE_CURRENT_BINARY_DIR}/blender.exe.manifest @ONLY) - - - - diff --git a/extern/quadriflow/3rd/lemon-1.3.1/CMakeLists.txt b/extern/quadriflow/3rd/lemon-1.3.1/CMakeLists.txt index 7aa6d430906..b20b163a16a 100644 --- a/extern/quadriflow/3rd/lemon-1.3.1/CMakeLists.txt +++ b/extern/quadriflow/3rd/lemon-1.3.1/CMakeLists.txt @@ -67,7 +67,7 @@ SET(LEMON_ENABLE_ILOG YES CACHE STRING "Enable ILOG (CPLEX) solver backend.") SET(LEMON_ENABLE_COIN YES CACHE STRING "Enable COIN solver backend.") SET(LEMON_ENABLE_SOPLEX YES CACHE STRING "Enable SoPlex solver backend.") -IF(LEMON_ENABLE_GLPK) +IF(LEMON_ENABLE_GLPK) FIND_PACKAGE(GLPK 4.33) ENDIF(LEMON_ENABLE_GLPK) IF(LEMON_ENABLE_ILOG) diff --git a/extern/quadriflow/3rd/lemon-1.3.1/cmake/FindILOG.cmake b/extern/quadriflow/3rd/lemon-1.3.1/cmake/FindILOG.cmake index a09fc9a2753..584df4f6994 100644 --- a/extern/quadriflow/3rd/lemon-1.3.1/cmake/FindILOG.cmake +++ b/extern/quadriflow/3rd/lemon-1.3.1/cmake/FindILOG.cmake @@ -4,7 +4,7 @@ FIND_PATH(ILOG_ROOT_DIR PATHS /opt/ibm/ILOG /usr/local/ibm/ILOG /usr/local/ILOG /usr/local/ilog PATHS "$ENV{HOME}/ILOG" "$ENV{HOME}/.local/ILOG" PATHS "$ENV{HOME}/ibm/ILOG" "$ENV{HOME}/.local/ibm/ILOG" - PATHS "C:/Program Files/IBM/ILOG" + PATHS "C:/Program Files/IBM/ILOG" PATH_SUFFIXES "CPLEX_Studio126" "CPLEX_Studio125" "CPLEX_Studio124" "CPLEX_Studio123" "CPLEX_Studio122" NO_DEFAULT_PATH diff --git a/extern/quadriflow/3rd/lemon-1.3.1/contrib/CMakeLists.txt b/extern/quadriflow/3rd/lemon-1.3.1/contrib/CMakeLists.txt index b6c11e2aad4..fd393bcc420 100644 --- a/extern/quadriflow/3rd/lemon-1.3.1/contrib/CMakeLists.txt +++ b/extern/quadriflow/3rd/lemon-1.3.1/contrib/CMakeLists.txt @@ -16,4 +16,3 @@ LINK_DIRECTORIES( # ADD_EXECUTABLE(myprog myprog-main.cc) # TARGET_LINK_LIBRARIES(myprog lemon) - diff --git a/extern/quadriflow/3rd/lemon-1.3.1/lemon/CMakeLists.txt b/extern/quadriflow/3rd/lemon-1.3.1/lemon/CMakeLists.txt index 4e6567e49c7..f3501ca865b 100644 --- a/extern/quadriflow/3rd/lemon-1.3.1/lemon/CMakeLists.txt +++ b/extern/quadriflow/3rd/lemon-1.3.1/lemon/CMakeLists.txt @@ -88,4 +88,3 @@ INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/lemon.pc DESTINATION lib/pkgconfig ) - diff --git a/source/blender/draw/engines/eevee/shaders/renderpass_postprocess_frag.glsl b/source/blender/draw/engines/eevee/shaders/renderpass_postprocess_frag.glsl index 5a738d0f130..35bfb411cb9 100644 --- a/source/blender/draw/engines/eevee/shaders/renderpass_postprocess_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/renderpass_postprocess_frag.glsl @@ -61,4 +61,4 @@ void main() else { fragColor = vec4(1.0, 0.0, 1.0, 1.0); } -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/overlay_armature.c b/source/blender/draw/engines/overlay/overlay_armature.c index b0fb95380f4..0b77fcad265 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.c +++ b/source/blender/draw/engines/overlay/overlay_armature.c @@ -2354,4 +2354,4 @@ void OVERLAY_pose_draw(OVERLAY_Data *vedata) DRW_draw_pass(psl->armature_ps[1]); } -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/overlay_edit_curve.c b/source/blender/draw/engines/overlay/overlay_edit_curve.c index b39dc39fd47..d9b9fac6b4b 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_curve.c +++ b/source/blender/draw/engines/overlay/overlay_edit_curve.c @@ -129,4 +129,4 @@ void OVERLAY_edit_curve_draw(OVERLAY_Data *vedata) DRW_draw_pass(psl->edit_curve_wire_ps[1]); DRW_draw_pass(psl->edit_curve_handle_ps); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/overlay_edit_text.c b/source/blender/draw/engines/overlay/overlay_edit_text.c index 0975608a300..72b5ae74255 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_text.c +++ b/source/blender/draw/engines/overlay/overlay_edit_text.c @@ -202,4 +202,4 @@ void OVERLAY_edit_text_draw(OVERLAY_Data *vedata) DRW_draw_pass(psl->edit_text_wire_ps[1]); DRW_draw_pass(psl->edit_text_overlay_ps); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/overlay_private.h b/source/blender/draw/engines/overlay/overlay_private.h index 9be92e0ab14..996ee845799 100644 --- a/source/blender/draw/engines/overlay/overlay_private.h +++ b/source/blender/draw/engines/overlay/overlay_private.h @@ -571,4 +571,4 @@ OVERLAY_InstanceFormats *OVERLAY_shader_instance_formats_get(void); void OVERLAY_shader_free(void); -#endif /* __OVERLAY_PRIVATE_H__ */
\ No newline at end of file +#endif /* __OVERLAY_PRIVATE_H__ */ diff --git a/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl b/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl index 386e6d9e141..4784d420e1d 100644 --- a/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/antialiasing_frag.glsl @@ -147,4 +147,4 @@ void main() fragColor = mix(fragColor, fragColor / fragColor.a, blend); } #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/shaders/antialiasing_vert.glsl b/source/blender/draw/engines/overlay/shaders/antialiasing_vert.glsl index 4f3c36c7bd7..8cf8ba121ed 100644 --- a/source/blender/draw/engines/overlay/shaders/antialiasing_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/antialiasing_vert.glsl @@ -8,4 +8,4 @@ void main() float y = float((v & 2) << 1); gl_Position = vec4(x - 1.0, y - 1.0, 1.0, 1.0); uvs = vec2(x, y) * 0.5; -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/shaders/extra_frag.glsl b/source/blender/draw/engines/overlay/shaders/extra_frag.glsl index 8a8ae8a9611..a2572f44e70 100644 --- a/source/blender/draw/engines/overlay/shaders/extra_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/extra_frag.glsl @@ -10,4 +10,4 @@ void main() { fragColor = finalColor; lineOutput = pack_line_data(gl_FragCoord.xy, edgeStart, edgePos); -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/shaders/extra_groundline_vert.glsl b/source/blender/draw/engines/overlay/shaders/extra_groundline_vert.glsl index 4b08ea587d4..738f0025f07 100644 --- a/source/blender/draw/engines/overlay/shaders/extra_groundline_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/extra_groundline_vert.glsl @@ -27,4 +27,4 @@ void main() #ifdef USE_WORLD_CLIP_PLANES world_clip_planes_calc_clip_distance(world_pos); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/shaders/extra_loose_point_frag.glsl b/source/blender/draw/engines/overlay/shaders/extra_loose_point_frag.glsl index 8784b6cd73a..c27061f8f97 100644 --- a/source/blender/draw/engines/overlay/shaders/extra_loose_point_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/extra_loose_point_frag.glsl @@ -15,4 +15,4 @@ void main() * the depth and creating mini-spheres. * Disabled as it has performance impact. */ // gl_FragDepth = gl_FragCoord.z + 1e-6 * fac; -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/shaders/extra_loose_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/extra_loose_point_vert.glsl index 76a2678a50e..7e31bf966bc 100644 --- a/source/blender/draw/engines/overlay/shaders/extra_loose_point_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/extra_loose_point_vert.glsl @@ -17,4 +17,4 @@ void main() #ifdef USE_WORLD_CLIP_PLANES world_clip_planes_calc_clip_distance(world_pos); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/shaders/extra_point_vert.glsl b/source/blender/draw/engines/overlay/shaders/extra_point_vert.glsl index 14c03248981..537c55cf3f5 100644 --- a/source/blender/draw/engines/overlay/shaders/extra_point_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/extra_point_vert.glsl @@ -27,4 +27,4 @@ void main() #ifdef USE_WORLD_CLIP_PLANES world_clip_planes_calc_clip_distance(world_pos); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/shaders/extra_vert.glsl b/source/blender/draw/engines/overlay/shaders/extra_vert.glsl index a72c5adb691..92db27ea6dd 100644 --- a/source/blender/draw/engines/overlay/shaders/extra_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/extra_vert.glsl @@ -224,4 +224,4 @@ void main() #ifdef USE_WORLD_CLIP_PLANES world_clip_planes_calc_clip_distance(world_pos); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/shaders/extra_wire_frag.glsl b/source/blender/draw/engines/overlay/shaders/extra_wire_frag.glsl index 7e469aee18d..a2bc13ba443 100644 --- a/source/blender/draw/engines/overlay/shaders/extra_wire_frag.glsl +++ b/source/blender/draw/engines/overlay/shaders/extra_wire_frag.glsl @@ -28,4 +28,4 @@ void main() if (fract(dist / dash_width) > dash_factor) { discard; } -}
\ No newline at end of file +} diff --git a/source/blender/draw/engines/overlay/shaders/extra_wire_vert.glsl b/source/blender/draw/engines/overlay/shaders/extra_wire_vert.glsl index 933b9d65a5f..97183638a71 100644 --- a/source/blender/draw/engines/overlay/shaders/extra_wire_vert.glsl +++ b/source/blender/draw/engines/overlay/shaders/extra_wire_vert.glsl @@ -37,4 +37,4 @@ void main() #ifdef USE_WORLD_CLIP_PLANES world_clip_planes_calc_clip_distance(world_pos); #endif -}
\ No newline at end of file +} diff --git a/source/blender/draw/intern/draw_manager_text.c b/source/blender/draw/intern/draw_manager_text.c index 9462a0d8072..38e8544de07 100644 --- a/source/blender/draw/intern/draw_manager_text.c +++ b/source/blender/draw/intern/draw_manager_text.c @@ -526,4 +526,4 @@ void DRW_text_edit_mesh_measure_stats(ARegion *ar, } } } -}
\ No newline at end of file +} diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index a7a816385ad..98cfe53592e 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1049,7 +1049,7 @@ setup_liblinks(blender) # USD registry. # USD requires a set of JSON files that define the standard schemas. These # files are required at runtime. -if (WITH_USD) +if(WITH_USD) add_definitions(-DWITH_USD) install(DIRECTORY ${LIBDIR}/usd/lib/usd |