diff options
author | Jacques Lucke <jacques@blender.org> | 2020-04-06 13:01:13 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-04-06 13:01:13 +0300 |
commit | 2cc55bcdc24683210a42e784cdb4636187a48077 (patch) | |
tree | 3ce18325eb84eae98f33117c25262655f259978c /source/blender | |
parent | ffb328567297ad4b3a1e96c9e85ac547446093b5 (diff) |
fix after merge
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 2 | ||||
-rw-r--r-- | source/blender/nodes/simulation/node_simulation_tree.cc | 2 | ||||
-rw-r--r-- | source/blender/nodes/simulation/nodes/node_sim_common.cc | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index eeea12b64bc..4feb53f95bb 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -1818,7 +1818,7 @@ static StructRNA *rna_SimulationNode_register(Main *bmain, /* update while blender is running */ WM_main_add_notifier(NC_NODE | NA_EDITED, NULL); - return nt->ext.srna; + return nt->rna_ext.srna; } static IDProperty *rna_Node_idprops(PointerRNA *ptr, bool create) diff --git a/source/blender/nodes/simulation/node_simulation_tree.cc b/source/blender/nodes/simulation/node_simulation_tree.cc index b9af19b26cd..3f0e70259d6 100644 --- a/source/blender/nodes/simulation/node_simulation_tree.cc +++ b/source/blender/nodes/simulation/node_simulation_tree.cc @@ -39,7 +39,7 @@ void register_node_tree_type_sim(void) strcpy(tt->ui_name, N_("Simulation Editor")); tt->ui_icon = 0; /* defined in drawnode.c */ strcpy(tt->ui_description, N_("Simulation nodes")); - tt->ext.srna = &RNA_SimulationNodeTree; + tt->rna_ext.srna = &RNA_SimulationNodeTree; ntreeTypeAdd(tt); } diff --git a/source/blender/nodes/simulation/nodes/node_sim_common.cc b/source/blender/nodes/simulation/nodes/node_sim_common.cc index 1db7eb03cf3..fbc03905d4f 100644 --- a/source/blender/nodes/simulation/nodes/node_sim_common.cc +++ b/source/blender/nodes/simulation/nodes/node_sim_common.cc @@ -32,9 +32,9 @@ void register_node_type_sim_group(void) ntype.poll_instance = node_group_poll_instance; ntype.insert_link = node_insert_link_default; ntype.update_internal_links = node_update_internal_links_default; - ntype.ext.srna = RNA_struct_find("SimulationNodeGroup"); - BLI_assert(ntype.ext.srna != NULL); - RNA_struct_blender_type_set(ntype.ext.srna, &ntype); + ntype.rna_ext.srna = RNA_struct_find("SimulationNodeGroup"); + BLI_assert(ntype.rna_ext.srna != NULL); + RNA_struct_blender_type_set(ntype.rna_ext.srna, &ntype); node_type_socket_templates(&ntype, NULL, NULL); node_type_size(&ntype, 140, 60, 400); |