forked from bartvdbraak/blender
Merge remote-tracking branch 'origin/master' into blender2.8
This commit is contained in:
commit
cdce3b71df
@ -10,5 +10,5 @@ echo Compiler Detection failed. Use verbose switch for more information.
|
||||
exit /b 1
|
||||
|
||||
:DetectionComplete
|
||||
echo Compiler Detection successfull, detected VS%BUILD_VS_YEAR%
|
||||
echo Compiler Detection successful, detected VS%BUILD_VS_YEAR%
|
||||
exit /b 0
|
@ -36,7 +36,7 @@ if NOT EXIST %BUILD_VS_LIBDIR% (
|
||||
echo.
|
||||
echo Error: Download of external libraries failed.
|
||||
echo This is needed for building, please manually run 'svn cleanup' and 'svn update' in
|
||||
echo %BUILD_VS_LIBDIR% , until this is resolved you CANNOT make a successfull blender build
|
||||
echo %BUILD_VS_LIBDIR% , until this is resolved you CANNOT make a successful blender build
|
||||
echo.
|
||||
exit /b 1
|
||||
)
|
||||
|
@ -52,7 +52,7 @@ ccl_device void voronoi_neighbors(float3 p, NodeVoronoiDistanceMetric distance,
|
||||
case NODE_VORONOI_CHEBYCHEV:
|
||||
d = max3(fabs(vp - p));
|
||||
break;
|
||||
case NODE_VORONOI_MINKOWSKI:
|
||||
case NODE_VORONOI_MINKOWSKI: {
|
||||
float3 n = fabs(vp - p);
|
||||
if(e == 0.5f) {
|
||||
d = sqr(reduce_add(sqrt(n)));
|
||||
@ -61,6 +61,7 @@ ccl_device void voronoi_neighbors(float3 p, NodeVoronoiDistanceMetric distance,
|
||||
d = powf(reduce_add(pow3(n, e)), 1.0f/e);
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* To keep the shortest four distances and associated points we have to keep them in sorted order. */
|
||||
|
@ -280,11 +280,6 @@ ccl_device_inline float3 sqrt(const float3& a)
|
||||
#endif
|
||||
}
|
||||
|
||||
ccl_device_inline float3 pow3(const float3& a, float e)
|
||||
{
|
||||
return make_float3(powf(a.x, e), powf(a.y, e), powf(a.z, e));
|
||||
}
|
||||
|
||||
ccl_device_inline float3 mix(const float3& a, const float3& b, float t)
|
||||
{
|
||||
return a + t*(b - a);
|
||||
@ -382,6 +377,11 @@ ccl_device_inline bool isequal_float3(const float3 a, const float3 b)
|
||||
#endif
|
||||
}
|
||||
|
||||
ccl_device_inline float3 pow3(float3 v, float e)
|
||||
{
|
||||
return make_float3(powf(v.x, e), powf(v.y, e), powf(v.z, e));
|
||||
}
|
||||
|
||||
ccl_device_inline float3 exp3(float3 v)
|
||||
{
|
||||
return make_float3(expf(v.x), expf(v.y), expf(v.z));
|
||||
|
Loading…
Reference in New Issue
Block a user