Commit: 98357a85c8f024fcfc7dca01f43d60ab0f781d02
Author: L. E. Segovia
Date: Sat Jun 30 13:37:43 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB98357a85c8f024fcfc7dca01f43d60ab0f781d02
General cleanup and more documentation
===================================================================
M intern/cycles/kernel/svm/svm_types.h
M release/scripts/addons_contrib
M source/blender/blenkernel/intern/node.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/nodes/CMakeLists.txt
M source/tools
===================================================================
diff --git a/intern/cycles/kernel/svm/svm_types.h
b/intern/cycles/kernel/svm/svm_types.h
index eec41518a39..990a40f6f02 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -488,15 +488,15 @@ typedef enum ClosureType {
#define CLOSURE_IS_BSDF_TRANSMISSION(type) (type >=
CLOSURE_BSDF_TRANSLUCENT_ID && type <= CLOSURE_BSDF_HAIR_TRANSMISSION_ID)
#define CLOSURE_IS_BSDF_BSSRDF(type) (type == CLOSURE_BSDF_BSSRDF_ID || type
== CLOSURE_BSDF_BSSRDF_PRINCIPLED_ID)
#define CLOSURE_IS_BSDF_SINGULAR(type) (type == CLOSURE_BSDF_REFLECTION_ID || \
-
type == CLOSURE_BSDF_REFRACTION_ID || \
-
type == CLOSURE_BSDF_TRANSPARENT_ID)
+ type == CLOSURE_BSDF_REFRACTION_ID || \
+ type == CLOSURE_BSDF_TRANSPARENT_ID)
#define CLOSURE_IS_BSDF_TRANSPARENT(type) (type == CLOSURE_BSDF_TRANSPARENT_ID)
#define CLOSURE_IS_BSDF_MULTISCATTER(type) (type ==
CLOSURE_BSDF_MICROFACET_MULTI_GGX_ID ||\
-
type == CLOSURE_BSDF_MICROFACET_MULTI_GGX_ANISO_ID || \
-
type == CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID)
+ type ==
CLOSURE_BSDF_MICROFACET_MULTI_GGX_ANISO_ID || \
+ type ==
CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID)
#define CLOSURE_IS_BSDF_MICROFACET(type) ((type >=
CLOSURE_BSDF_MICROFACET_GGX_ID && type <=
CLOSURE_BSDF_ASHIKHMIN_SHIRLEY_ANISO_ID) ||\
-
(type >= CLOSURE_BSDF_MICROFACET_BECKMANN_REFRACTION_ID && type <=
CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID) ||\
-
(type == CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_FRESNEL_ID))
+ (type >=
CLOSURE_BSDF_MICROFACET_BECKMANN_REFRACTION_ID && type <=
CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_ID) ||\
+ (type ==
CLOSURE_BSDF_MICROFACET_MULTI_GGX_GLASS_FRESNEL_ID))
#define CLOSURE_IS_BSDF_OR_BSSRDF(type) (type <=
CLOSURE_BSSRDF_PRINCIPLED_RANDOM_WALK_ID)
#define CLOSURE_IS_BSSRDF(type) (type >= CLOSURE_BSSRDF_CUBIC_ID && type <=
CLOSURE_BSSRDF_PRINCIPLED_RANDOM_WALK_ID)
#define CLOSURE_IS_DISK_BSSRDF(type) (type >= CLOSURE_BSSRDF_CUBIC_ID && type
<= CLOSURE_BSSRDF_BURLEY_ID)
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index f178e6c933a..15b25a42783 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit f178e6c933a25c621a5cc7d92935b66cd2ec2f5d
+Subproject commit 15b25a42783d1e516b5298d70b582fae2559ae17
diff --git a/source/blender/blenkernel/intern/node.c
b/source/blender/blenkernel/intern/node.c
index 4fba08c6c0c..7fc0e888f63 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3621,7 +3621,7 @@ static void registerShaderNodes(void)
register_node_type_sh_bsdf_velvet();
register_node_type_sh_bsdf_toon();
register_node_type_sh_bsdf_hair();
- register_node_type_sh_bsdf_hair_principled();
+ register_node_type_sh_bsdf_hair_principled();
register_node_type_sh_emission();
register_node_type_sh_holdout();
register_node_type_sh_volume_absorption();
diff --git a/source/blender/makesrna/intern/rna_nodetree.c
b/source/blender/makesrna/intern/rna_nodetree.c
index 7d81b3d88c5..e73728711f1 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -4359,6 +4359,7 @@ static void def_hair(StructRNA *srna)
RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update");
}
+/* RNA initialization for the custom property. */
static void def_hair_principled(StructRNA *srna)
{
PropertyRNA *prop;
@@ -4368,6 +4369,8 @@ static void def_hair_principled(StructRNA *srna)
RNA_def_property_ui_text(prop, "Color parametrization", "Select the
shader's color parametrization");
RNA_def_property_enum_items(prop, node_principled_hair_items);
RNA_def_property_enum_default(prop, SHD_PRINCIPLED_HAIR_REFLECTANCE);
+ /* Upon editing, update both the node data AND the UI representation */
+ /* (This effectively shows/hides the relevant sockets) */
RNA_def_property_update(prop, NC_NODE | NA_EDITED,
"rna_ShaderNodeHairPrincipled_update");
}
diff --git a/source/blender/nodes/CMakeLists.txt
b/source/blender/nodes/CMakeLists.txt
index 3ea94cf35f0..7021ffc8ea4 100644
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@ -172,7 +172,7 @@ set(SRC
shader/nodes/node_shader_bsdf_transparent.c
shader/nodes/node_shader_bsdf_velvet.c
shader/nodes/node_shader_bsdf_hair.c
- shader/nodes/node_shader_bsdf_hair_principled.c
+ shader/nodes/node_shader_bsdf_hair_principled.c
shader/nodes/node_shader_bump.c
shader/nodes/node_shader_emission.c
shader/nodes/node_shader_fresnel.c
diff --git a/source/tools b/source/tools
index cd4c4ec2428..1909ca5d3fc 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit cd4c4ec24285f780e6b92a91f3684723444c9a73
+Subproject commit 1909ca5d3fc204ecce24c4b3bfbf927942e9ec3a
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
