diff --git a/CMakeLists.txt b/CMakeLists.txt index 54b30068860..5031a449e32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1179,8 +1179,8 @@ if(WIN32) option(WITH_WINDOWS_BUNDLE_CRT "Bundle the C runtime for install free distribution." ON) mark_as_advanced(WITH_WINDOWS_BUNDLE_CRT) - if(WITH_WINDOWS_BUNDLE_CRT AND - CMAKE_VERSION VERSION_LESS "4.2.0" AND + if(WITH_WINDOWS_BUNDLE_CRT AND + CMAKE_VERSION VERSION_LESS "4.2.0" AND MSVC_VERSION GREATER_EQUAL 1950) message(WARNING "VS2026 not supported on this CMAKE version: WITH_WINDOWS_BUNDLE_CRT will be disabled") set(WITH_WINDOWS_BUNDLE_CRT OFF) diff --git a/tests/files/imbuf_io/broken_images/readme.txt b/tests/files/imbuf_io/broken_images/readme.txt index 7d92e905e93..78996e3278a 100644 --- a/tests/files/imbuf_io/broken_images/readme.txt +++ b/tests/files/imbuf_io/broken_images/readme.txt @@ -1,3 +1,3 @@ -This folder contains images which are intentionally broken and can not be +This folder contains images which are intentionally broken and can not be loaded normally. Used to test that image IO code handles them correctly -giving an error message instead of crashing. \ No newline at end of file +giving an error message instead of crashing. diff --git a/tests/files/paint/multipaint_test_results.txt b/tests/files/paint/multipaint_test_results.txt index e8d8782b48a..cb9e8830e55 100644 --- a/tests/files/paint/multipaint_test_results.txt +++ b/tests/files/paint/multipaint_test_results.txt @@ -62,4 +62,4 @@ For any case: Weights of zero should always remain zero. -Having only one bone selected should behave like a regular paint. \ No newline at end of file +Having only one bone selected should behave like a regular paint. diff --git a/tests/performance/api/graph.template.html b/tests/performance/api/graph.template.html index 8a3811eb8b7..866aca7ba35 100644 --- a/tests/performance/api/graph.template.html +++ b/tests/performance/api/graph.template.html @@ -46,23 +46,23 @@ var chartData = chartsQueue[index]; var chart; - + if (chartData.chart_type == 'line') { chart = new google.charts.Line(document.getElementById(chartData.id)); } else { chart = new google.charts.Bar(document.getElementById(chartData.id)); } - + google.visualization.events.addOneTimeListener(chart, 'ready', function() { /* Auto scale chart elements to display full SVG. */ var allSvg = document.getElementsByTagName("svg"); for (var svgIndex = 0; svgIndex < allSvg.length; svgIndex++) { allSvg[svgIndex].setAttribute('height', allSvg[svgIndex].getBBox().height); } - + drawChart(chartsQueue, index + 1); }); - + chart.draw(chartData.data, chartData.options); } @@ -151,10 +151,10 @@ options: options, chart_type: benchmark['chart_type'] }; - + chartsQueue.push(chartData); } - + /* Start drawing charts sequentially. */ drawChart(chartsQueue, 0); } diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index ac9bd9b3f6b..ff117d32b31 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -349,7 +349,7 @@ if(TEST_SRC_DIR_EXISTS) ) # This test is intermittently failing. Disable it for now to avoid other work -# being incorrectly flagged as broken. Once issue #146221 is resolved this +# being incorrectly flagged as broken. Once issue #146221 is resolved this # test must be re-enabled. # # add_blender_test(