diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-31 14:57:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-31 14:57:38 +0300 |
| commit | 323a7ab944132335f27ba21519df161d7a3351c9 (patch) | |
| tree | ebccd8e52bcead21faaadbcf4c427293e598061c /source/blender/makesrna/intern/rna_nodetree.c | |
| parent | 480def9c5587b710ce478a58985e2e4359c14467 (diff) | |
| parent | a35aae9e4972656c0e619c03aa0b26c903d16b34 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_nodetree.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 45549e4007f..294c40d4094 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -637,7 +637,7 @@ static StructRNA *rna_NodeTree_register( if (nt) { rna_NodeTree_unregister(bmain, nt->ext.srna); } - if (!RNA_struct_available_or_report(reports, identifier)) { + if (!RNA_struct_available_or_report(reports, dummynt.idname)) { return NULL; } @@ -1397,16 +1397,13 @@ static bNodeType *rna_Node_register_base(Main *bmain, ReportList *reports, Struc identifier, (int)sizeof(dummynt.idname)); return NULL; } - if (!RNA_struct_available_or_report(reports, identifier)) { - return NULL; - } /* check if we have registered this node type before, and remove it */ nt = nodeTypeFind(dummynt.idname); if (nt) { rna_Node_unregister(bmain, nt->ext.srna); } - if (!RNA_struct_available_or_report(reports, identifier)) { + if (!RNA_struct_available_or_report(reports, dummynt.idname)) { return NULL; } |