From 7adb415070394707eec418f058005ebde0158eb2 Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Wed, 19 May 2021 11:44:10 +0200 Subject: Geometry Nodes: don't show grease pencil materials for now Those materials cannot be on geometry handled by geometry nodes yet. So it makes sense not to show those materials in the material socket. --- source/blender/makesrna/intern/rna_nodetree.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source/blender/makesrna/intern/rna_nodetree.c') diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index a1b6885e7e2..6cb893d1657 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -4455,6 +4455,13 @@ void rna_ShaderNodePointDensity_density_minmax(bNode *self, RE_point_density_minmax(depsgraph, pd, r_min, r_max); } +bool rna_NodeSocketMaterial_default_value_poll(PointerRNA *UNUSED(ptr), PointerRNA value) +{ + /* Do not show grease pencil materials for now. */ + Material *ma = (Material *)value.data; + return ma->gp_style == NULL; +} + #else static const EnumPropertyItem prop_image_layer_items[] = { @@ -10674,6 +10681,8 @@ static void rna_def_node_socket_material(BlenderRNA *brna, prop = RNA_def_property(srna, "default_value", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "value"); RNA_def_property_struct_type(prop, "Material"); + RNA_def_property_pointer_funcs( + prop, NULL, NULL, NULL, "rna_NodeSocketMaterial_default_value_poll"); RNA_def_property_ui_text(prop, "Default Value", "Input value used for unconnected socket"); RNA_def_property_update( prop, NC_NODE | NA_EDITED, "rna_NodeSocketStandard_value_and_relation_update"); @@ -10689,6 +10698,8 @@ static void rna_def_node_socket_material(BlenderRNA *brna, prop = RNA_def_property(srna, "default_value", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "value"); RNA_def_property_struct_type(prop, "Material"); + RNA_def_property_pointer_funcs( + prop, NULL, NULL, NULL, "rna_NodeSocketMaterial_default_value_poll"); RNA_def_property_ui_text(prop, "Default Value", "Input value used for unconnected socket"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_NodeSocketInterface_update"); } -- cgit v1.2.3