[Bf-blender-cvs] [4c918efd44b] master: Cleanup: trailing space

Campbell Barton noreply at git.blender.org
Wed Sep 19 03:52:24 CEST 2018


Commit: 4c918efd44be11d47afc1efed684a15ad5579722
Author: Campbell Barton
Date:   Wed Sep 19 12:04:34 2018 +1000
Branches: master
https://developer.blender.org/rB4c918efd44be11d47afc1efed684a15ad5579722

Cleanup: trailing space

===================================================================

M	build_files/build_environment/cmake/opencollada.cmake
M	intern/cycles/util/util_avxb.h

===================================================================

diff --git a/build_files/build_environment/cmake/opencollada.cmake b/build_files/build_environment/cmake/opencollada.cmake
index c9aee2bfe64..ec3dcde1607 100644
--- a/build_files/build_environment/cmake/opencollada.cmake
+++ b/build_files/build_environment/cmake/opencollada.cmake
@@ -48,7 +48,7 @@ if(WIN32)
 	endif()
 	if(BUILD_MODE STREQUAL Debug)
 		ExternalProject_Add_Step(external_opencollada after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib 
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib
 			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/ftoa.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/ftoa_d.lib
 			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/GeneratedSaxParser.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/GeneratedSaxParser_d.lib
 			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/MathMLSolver.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/MathMLSolver_d.lib
diff --git a/intern/cycles/util/util_avxb.h b/intern/cycles/util/util_avxb.h
index 4add69bcb91..25ef39d39ae 100644
--- a/intern/cycles/util/util_avxb.h
+++ b/intern/cycles/util/util_avxb.h
@@ -99,7 +99,7 @@ __forceinline const avxb operator ==( const avxb& a, const avxb& b )
 	__m128i c_hi = _mm_cmpeq_epi32(a_hi, b_hi);
 	__m256i result = _mm256_insertf128_si256(_mm256_castsi128_si256(c_lo), c_hi, 1);
 	return _mm256_castsi256_ps(result);
-#endif 
+#endif
 }
 
 __forceinline const avxb select( const avxb& m, const avxb& t, const avxb& f ) {



More information about the Bf-blender-cvs mailing list