archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2017-09-01 02:30:48 +10:00
parent 323a7ab944 0bbae3f3f6
commit c843e84892
21 changed files with 140 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesrna/intern/rna_nodetree.c
View File

@@ -637,9 +637,6 @@ static StructRNA *rna_NodeTree_register(
if (nt) {
rna_NodeTree_unregister(bmain, nt->ext.srna);
}
if (!RNA_struct_available_or_report(reports, dummynt.idname)) {
return NULL;
}
/* create a new node tree type */
nt = MEM_callocN(sizeof(bNodeTreeType), "node tree type");
@@ -1403,9 +1400,6 @@ static bNodeType *rna_Node_register_base(Main *bmain, ReportList *reports, Struc
if (nt) {
rna_Node_unregister(bmain, nt->ext.srna);
}
if (!RNA_struct_available_or_report(reports, dummynt.idname)) {
return NULL;
}
/* create a new node type */
nt = MEM_callocN(sizeof(bNodeType), "node type");