[Bf-blender-cvs] [41299bce936] master: Fix T69808: crash using custom Node.draw_label

Brecht Van Lommel noreply at git.blender.org
Tue Sep 17 15:12:26 CEST 2019


Commit: 41299bce936afb5e7da9c332d1140c5a77d49317
Author: Brecht Van Lommel
Date:   Tue Sep 17 15:08:48 2019 +0200
Branches: master
https://developer.blender.org/rB41299bce936afb5e7da9c332d1140c5a77d49317

Fix T69808: crash using custom Node.draw_label

Start happening after 9ecbd67dfb67, but code was already wrong.

===================================================================

M	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 913324e4997..755c35988d6 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -1482,7 +1482,7 @@ static void rna_Node_draw_label(bNodeTree *ntree, bNode *node, char *label, int
   node->typeinfo->ext.call(NULL, &ptr, func, &list);
 
   RNA_parameter_get_lookup(&list, "label", &ret);
-  rlabel = *(char **)ret;
+  rlabel = (char *)ret;
   BLI_strncpy(label, rlabel != NULL ? rlabel : "", maxlen);
 
   RNA_parameter_list_free(&list);



More information about the Bf-blender-cvs mailing list