[Bf-blender-cvs] [9c051129109] functions: fix after merge

[Jacques Lucke]

Commit: 9c05112910946581ccf17b23fc0ec5f0297467a3
Author: Jacques Lucke
Date:   Fri Aug 23 10:12:22 2019 +0200
Branches: functions
https://developer.blender.org/rB9c05112910946581ccf17b23fc0ec5f0297467a3

fix after merge

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

M	source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
M	source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
M	source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.cpp
M	source/blender/simulations/bparticles/inserters.cpp
M	source/blender/simulations/bparticles/particle_function_builder.cpp

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

diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp b/source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
index 761911d0d23..a484ee72aec 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/node_inserters.cpp
@@ -263,7 +263,7 @@ static void INSERT_call(VTreeDataGraphBuilder &builder, VirtualNode *vnode)
   PointerRNA rna = vnode->rna();
 
   PointerRNA btree_ptr = RNA_pointer_get(&rna, "function_tree");
-  bNodeTree *btree = (bNodeTree *)btree_ptr.id.data;
+  bNodeTree *btree = (bNodeTree *)btree_ptr.owner_id;
 
   if (btree == nullptr) {
     BLI_assert(vnode->inputs().size() == 0);
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp b/source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
index 30b6bf0c80b..f19a72c891f 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings/socket_loaders.cpp
@@ -39,7 +39,7 @@ static void LOAD_boolean(PointerRNA *rna, Tuple &tuple, uint index)
 
 static void LOAD_object(PointerRNA *rna, Tuple &tuple, uint index)
 {
-  Object *value = (Object *)RNA_pointer_get(rna, "value").id.data;
+  Object *value = (Object *)RNA_pointer_get(rna, "value").data;
   tuple.set<Object *>(index, value);
 }
 
diff --git a/source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.cpp b/source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.cpp
index c63f80893b2..0546a9a9056 100644
--- a/source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/unlinked_input_inserters.cpp
@@ -55,7 +55,7 @@ class SocketLoaderDependencies : public DepsBody {
       if (STREQ(bsocket->idname, "fn_ObjectSocket")) {
         PointerRNA rna;
         RNA_pointer_create(&btree->id, &RNA_NodeSocket, bsocket, &rna);
-        Object *value = (Object *)RNA_pointer_get(&rna, "value").id.data;
+        Object *value = (Object *)RNA_pointer_get(&rna, "value").data;
         if (value != nullptr) {
           builder.add_output_objects(i, {value});
         }
diff --git a/source/blender/simulations/bparticles/inserters.cpp b/source/blender/simulations/bparticles/inserters.cpp
index b88b67ec942..c12aa99f2ff 100644
--- a/source/blender/simulations/bparticles/inserters.cpp
+++ b/source/blender/simulations/bparticles/inserters.cpp
@@ -365,7 +365,7 @@ static std::unique_ptr<Emitter> BUILD_EMITTER_custom_function(BuildContext &ctx,
                                                               StringRef particle_type_name)
 {
   PointerRNA rna = vnode->rna();
-  bNodeTree *btree = (bNodeTree *)RNA_pointer_get(&rna, "function_tree").id.data;
+  bNodeTree *btree = (bNodeTree *)RNA_pointer_get(&rna, "function_tree").data;
   if (btree == nullptr) {
     return {};
   }
diff --git a/source/blender/simulations/bparticles/particle_function_builder.cpp b/source/blender/simulations/bparticles/particle_function_builder.cpp
index 1e61034f9b7..5e532bc4936 100644
--- a/source/blender/simulations/bparticles/particle_function_builder.cpp
+++ b/source/blender/simulations/bparticles/particle_function_builder.cpp
@@ -205,7 +205,7 @@ static ParticleFunctionInputProvider *create_input_provider(VirtualSocket *vsock
   }
   else if (STREQ(vnode->idname(), "bp_SurfaceImageNode")) {
     PointerRNA rna = vnode->rna();
-    Image *image = (Image *)RNA_pointer_get(&rna, "image").id.data;
+    Image *image = (Image *)RNA_pointer_get(&rna, "image").data;
     BLI_assert(image != nullptr);
     return new SurfaceImageInputProvider(image);
   }