blender: fix gcc-8.2.0 build
Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
parent
3d95c58971
commit
15fb3494ba
2 changed files with 22 additions and 0 deletions
11
srcpkgs/blender/patches/tree_hpp.patch
Normal file
11
srcpkgs/blender/patches/tree_hpp.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/intern/itasc/kdl/tree.hpp 2018-03-23 16:22:25.000000000 +0100
|
||||||
|
+++ b/intern/itasc/kdl/tree.hpp 2018-08-13 19:31:32.101185313 +0200
|
||||||
|
@@ -34,7 +34,7 @@
|
||||||
|
//Forward declaration
|
||||||
|
class TreeElement;
|
||||||
|
// Eigen allocator is needed for alignment of Eigen data types
|
||||||
|
- typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<std::string, TreeElement> > > SegmentMap;
|
||||||
|
+ typedef std::map<std::string,TreeElement, std::less<std::string>, Eigen::aligned_allocator<std::pair<const std::string, TreeElement> > > SegmentMap;
|
||||||
|
|
||||||
|
class TreeElement
|
||||||
|
{
|
11
srcpkgs/blender/patches/util_sseb.patch
Normal file
11
srcpkgs/blender/patches/util_sseb.patch
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/intern/cycles/util/util_sseb.h
|
||||||
|
+++ b/intern/cycles/util/util_sseb.h
|
||||||
|
@@ -116,7 +116,7 @@ __forceinline const sseb unpacklo( const sseb& a, const sseb& b ) { return _mm_u
|
||||||
|
__forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); }
|
||||||
|
|
||||||
|
template<size_t i0, size_t i1, size_t i2, size_t i3> __forceinline const sseb shuffle( const sseb& a ) {
|
||||||
|
- return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0));
|
||||||
|
+ return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)));
|
||||||
|
}
|
||||||
|
|
||||||
|
template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) {
|
Loading…
Reference in a new issue