[Bf-blender-cvs] [e2c567efe6f] builtin-simulation-nodes: fix after merge

[Jacques Lucke]

Commit: e2c567efe6f09d77fb34d6fad8394cd4b6b99a56
Author: Jacques Lucke
Date:   Mon Apr 6 11:22:43 2020 +0200
Branches: builtin-simulation-nodes
https://developer.blender.org/rBe2c567efe6f09d77fb34d6fad8394cd4b6b99a56

fix after merge

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

M	source/blender/makesrna/intern/rna_nodetree.c
M	source/blender/nodes/simulation/node_sim_tree.cc
M	source/blender/nodes/simulation/nodes/node_sim_common.cc

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

diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c
index 1ba43136dab..b884dd98d0a 100644
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@ -1905,7 +1905,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 StructRNA *rna_FunctionNode_register(Main *bmain,
@@ -1927,7 +1927,7 @@ static StructRNA *rna_FunctionNode_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_sim_tree.cc b/source/blender/nodes/simulation/node_sim_tree.cc
index 7d61b6e0903..ecaeda20edd 100644
--- a/source/blender/nodes/simulation/node_sim_tree.cc
+++ b/source/blender/nodes/simulation/node_sim_tree.cc
@@ -24,7 +24,7 @@ void register_node_tree_type_sim(void)
   tt->ui_icon = 0; /* defined in drawnode.c */
   strcpy(tt->ui_description, N_("Simulation nodes"));
   tt->poll = [](const bContext *UNUSED(C), bNodeTreeType *UNUSED(treetype)) { return true; };
-  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 4de1348bc9f..d61917834fe 100644
--- a/source/blender/nodes/simulation/nodes/node_sim_common.cc
+++ b/source/blender/nodes/simulation/nodes/node_sim_common.cc
@@ -2,9 +2,9 @@
 
 #include "NOD_simulation.h"
 
-#include "node_sim_util.h"
 #include "NOD_common.h"
 #include "node_common.h"
+#include "node_sim_util.h"
 
 void register_node_type_sim_group(void)
 {
@@ -17,9 +17,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);
@@ -27,4 +27,4 @@ void register_node_type_sim_group(void)
   node_type_group_update(&ntype, node_group_update);
 
   nodeRegisterType(&ntype);
-}
\ No newline at end of file
+}