diff options
author | Charlie Jolly <charlie> | 2019-11-06 17:19:58 +0300 |
---|---|---|
committer | Charlie Jolly <mistajolly@gmail.com> | 2019-11-06 17:20:00 +0300 |
commit | 3a65ea3b2d62235fdabf9eeeade675e2b1e338aa (patch) | |
tree | ffbfaf07b079242586618b0ecdeb979fb91500f2 /source/blender/nodes/intern | |
parent | e71963a37e76bb52524e36816286db28fdbbcf57 (diff) |
Fix: Forward compatibility issue in shader nodes
Raised in https://developer.blender.org/rBe5618725fd1e
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D6102
Diffstat (limited to 'source/blender/nodes/intern')
-rw-r--r-- | source/blender/nodes/intern/node_util.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/source/blender/nodes/intern/node_util.c b/source/blender/nodes/intern/node_util.c index 455da4b3881..b16c814ade9 100644 --- a/source/blender/nodes/intern/node_util.c +++ b/source/blender/nodes/intern/node_util.c @@ -82,7 +82,10 @@ void *node_initexec_curves(bNodeExecContext *UNUSED(context), void node_blend_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen) { const char *name; - RNA_enum_name(rna_enum_ramp_blend_items, node->custom1, &name); + bool enum_label = RNA_enum_name(rna_enum_ramp_blend_items, node->custom1, &name); + if (!enum_label) { + name = "Unknown"; + } BLI_strncpy(label, IFACE_(name), maxlen); } @@ -96,21 +99,30 @@ void node_image_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int ma void node_math_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen) { const char *name; - RNA_enum_name(rna_enum_node_math_items, node->custom1, &name); + bool enum_label = RNA_enum_name(rna_enum_node_math_items, node->custom1, &name); + if (!enum_label) { + name = "Unknown"; + } BLI_strncpy(label, IFACE_(name), maxlen); } void node_vector_math_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen) { const char *name; - RNA_enum_name(rna_enum_node_vec_math_items, node->custom1, &name); + bool enum_label = RNA_enum_name(rna_enum_node_vec_math_items, node->custom1, &name); + if (!enum_label) { + name = "Unknown"; + } BLI_strncpy(label, IFACE_(name), maxlen); } void node_filter_label(bNodeTree *UNUSED(ntree), bNode *node, char *label, int maxlen) { const char *name; - RNA_enum_name(rna_enum_node_filter_items, node->custom1, &name); + bool enum_label = RNA_enum_name(rna_enum_node_filter_items, node->custom1, &name); + if (!enum_label) { + name = "Unknown"; + } BLI_strncpy(label, IFACE_(name), maxlen); } |