[Bf-blender-cvs] [927cf918fac] blender2.8: Cleanup: trailing space

Campbell Barton noreply at git.blender.org
Wed Aug 29 16:55:57 CEST 2018


Commit: 927cf918facac211c398720f1ac34eded1237f15
Author: Campbell Barton
Date:   Thu Aug 30 01:02:44 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB927cf918facac211c398720f1ac34eded1237f15

Cleanup: trailing space

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

M	build_files/cmake/platform/platform_win32.cmake
M	intern/cycles/bvh/bvh8.cpp
M	intern/cycles/util/util_avxb.h
M	intern/cycles/util/util_avxf.h

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

diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake
index ed32068dbfe..0c1175df39b 100644
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@ -454,7 +454,7 @@ if(WITH_OPENCOLORIO)
 	set(OPENCOLORIO ${LIBDIR}/opencolorio)
 	set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
 	set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib)
-	set(OPENCOLORIO_LIBRARIES 
+	set(OPENCOLORIO_LIBRARIES
 		optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
 		optimized ${OPENCOLORIO_LIBPATH}/tinyxml.lib
 		optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
diff --git a/intern/cycles/bvh/bvh8.cpp b/intern/cycles/bvh/bvh8.cpp
index e8b6726602c..b12c49a9ba7 100644
--- a/intern/cycles/bvh/bvh8.cpp
+++ b/intern/cycles/bvh/bvh8.cpp
@@ -357,7 +357,7 @@ void BVH8::pack_nodes(const BVHNode *root)
 					idx = nextNodeIdx;
 					nextNodeIdx += node_is_unaligned(nodes[i], bvh8)
 						? BVH_UNALIGNED_ONODE_SIZE
-						: BVH_ONODE_SIZE; 
+						: BVH_ONODE_SIZE;
 				}
 				stack.push_back(BVHStackEntry(nodes[i], idx));
 			}
diff --git a/intern/cycles/util/util_avxb.h b/intern/cycles/util/util_avxb.h
index 865549be283..60d9bb44256 100644
--- a/intern/cycles/util/util_avxb.h
+++ b/intern/cycles/util/util_avxb.h
@@ -34,7 +34,7 @@ struct avxb
 	////////////////////////////////////////////////////////////////////////////////
 	/// Constructors, Assignment & Cast Operators
 	////////////////////////////////////////////////////////////////////////////////
-	
+
 	__forceinline avxb           ( ) {}
 	__forceinline avxb           ( const avxb& other ) { m256 = other.m256; }
 	__forceinline avxb& operator=( const avxb& other ) { m256 = other.m256; return *this; }
@@ -43,10 +43,10 @@ struct avxb
 	__forceinline operator const __m256&( void ) const { return m256; }
 	__forceinline operator const __m256i( void ) const { return _mm256_castps_si256(m256); }
 	__forceinline operator const __m256d( void ) const { return _mm256_castps_pd(m256); }
-	
+
 	//__forceinline avxb           ( bool  a )
 	//	: m256(_mm_lookupmask_ps[(size_t(a) << 3) | (size_t(a) << 2) | (size_t(a) << 1) | size_t(a)]) {}
-	//__forceinline avxb           ( bool  a, bool  b) 
+	//__forceinline avxb           ( bool  a, bool  b)
 	//	: m256(_mm_lookupmask_ps[(size_t(b) << 3) | (size_t(a) << 2) | (size_t(b) << 1) | size_t(a)]) {}
 	//__forceinline avxb           ( bool  a, bool  b, bool  c, bool  d)
 	//	: m256(_mm_lookupmask_ps[(size_t(d) << 3) | (size_t(c) << 2) | (size_t(b) << 1) | size_t(a)]) {}
@@ -101,9 +101,9 @@ __forceinline const avxb operator ==( const avxb& a, const avxb& b ) { return _m
 
 __forceinline const avxb select( const avxb& m, const avxb& t, const avxb& f ) {
 #if defined(__KERNEL_SSE41__)
-	return _mm256_blendv_ps(f, t, m); 
+	return _mm256_blendv_ps(f, t, m);
 #else
-	return _mm256_or_ps(_mm256_and_ps(m, t), _mm256_andnot_ps(m, f)); 
+	return _mm256_or_ps(_mm256_and_ps(m, t), _mm256_andnot_ps(m, f));
 #endif
 }
 
@@ -189,4 +189,3 @@ ccl_device_inline void print_avxb(const char *label, const avxb &a)
 CCL_NAMESPACE_END
 
 //#endif
-
diff --git a/intern/cycles/util/util_avxf.h b/intern/cycles/util/util_avxf.h
index 81365f96c94..5596702ca20 100644
--- a/intern/cycles/util/util_avxf.h
+++ b/intern/cycles/util/util_avxf.h
@@ -237,4 +237,3 @@ __forceinline const avxb operator <=(const avxf& a, const avxf& b) {
     _mm256_set_m128(_mm_loadu_ps(hiaddr), _mm_loadu_ps(loaddr))
 
 CCL_NAMESPACE_END
-



More information about the Bf-blender-cvs mailing list