Commit: 16d486c372844aa43faed98cd5f0a07de36e8830
Author: L. E. Segovia
Date: Sun Jul 15 23:42:31 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB16d486c372844aa43faed98cd5f0a07de36e8830
Merge branch 'master' into soc-2018-hair-shader
Week 10 merge: corrected some clashes
===================================================================
===================================================================
diff --cc intern/cycles/util/util_math_float3.h
index 171b0a8ac9c,3a5a2ab2244..ba1c117cdea
--- a/intern/cycles/util/util_math_float3.h
+++ b/intern/cycles/util/util_math_float3.h
@@@ -377,16 -382,18 +382,28 @@@ ccl_device_inline bool isequal_float3(c
#endif
}
+ccl_device_inline float3 exp3(float3 v)
+{
+ return make_float3(expf(v.x), expf(v.y), expf(v.z));
+}
+
+ccl_device_inline float3 log3(float3 v)
+{
+ return make_float3(logf(v.x), logf(v.y), logf(v.z));
+}
+
+ ccl_device_inline int3 quick_floor_to_int3(const float3 a)
+ {
+ #ifdef __KERNEL_SSE__
+ int3 b = int3(_mm_cvttps_epi32(a.m128));
+ int3 isneg = int3(_mm_castps_si128(_mm_cmplt_ps(a.m128,
_mm_set_ps1(0.0f))));
+ /* Unsaturated add 0xffffffff is the same as subtract -1. */
+ return b + isneg;
+ #else
+ return make_int3(quick_floor_to_int(a.x), quick_floor_to_int(a.y),
quick_floor_to_int(a.z));
+ #endif
+ }
+
ccl_device_inline bool isfinite3_safe(float3 v)
{
return isfinite_safe(v.x) && isfinite_safe(v.y) && isfinite_safe(v.z);
diff --cc release/scripts/addons
index 142ef5b432e,9ae033c49c1..9ca218bf425
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 142ef5b432e883f70fdd103e006f47393c6b3a18
-Subproject commit 9ae033c49c1b16718eac6306bdc271a5e6e6bf38
++Subproject commit 9ca218bf4252869dda11b44029cdebfcbff9aad1
diff --cc source/blender/makesrna/intern/rna_nodetree.c
index 67e4f728b2d,e66c1e937e6..53514840f17
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@@ -3051,25 -3055,7 +3055,25 @@@ static void rna_ShaderNodeScript_update
ED_node_tag_update_nodetree(bmain, ntree, node);
}
+static void rna_ShaderNodePrincipled_update(Main *bmain, Scene *scene,
PointerRNA *ptr)
+{
+ bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+ bNode *node = (bNode *)ptr->data;
+
+ nodeUpdate(ntree, node);
+ rna_Node_update(bmain, scene, ptr);
+}
+
+static void rna_ShaderNodeHairPrincipled_update(Main *bmain, Scene *scene,
PointerRNA *ptr)
+{
+ bNodeTree *ntree = (bNodeTree *)ptr->id.data;
+ bNode *node = (bNode *)ptr->data;
+
+ nodeUpdate(ntree, node);
+ rna_Node_update(bmain, scene, ptr);
+}
+
- static void rna_ShaderNodeSubsurface_update(Main *bmain, Scene *scene,
PointerRNA *ptr)
+ static void rna_ShaderNode_socket_update(Main *bmain, Scene *scene,
PointerRNA *ptr)
{
bNodeTree *ntree = (bNodeTree *)ptr->id.data;
bNode *node = (bNode *)ptr->data;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
