[Bf-blender-cvs] [4b42c112fde] functions: cleanup accessing rna of virtual node
Jacques Lucke
noreply at git.blender.org
Mon Jul 22 18:13:17 CEST 2019
Commit: 4b42c112fde42480e7e95f3c260861e208a7d117
Author: Jacques Lucke
Date: Mon Jul 22 16:46:11 2019 +0200
Branches: functions
https://developer.blender.org/rB4b42c112fde42480e7e95f3c260861e208a7d117
cleanup accessing rna of virtual node
===================================================================
M source/blender/blenkernel/BKE_node_tree.hpp
M source/blender/functions/frontends/data_flow_nodes/builder.cpp
M source/blender/functions/frontends/data_flow_nodes/builder.hpp
M source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
M source/blender/simulations/bparticles/inserters.cpp
===================================================================
diff --git a/source/blender/blenkernel/BKE_node_tree.hpp b/source/blender/blenkernel/BKE_node_tree.hpp
index b96836e8010..5af7f6b1f44 100644
--- a/source/blender/blenkernel/BKE_node_tree.hpp
+++ b/source/blender/blenkernel/BKE_node_tree.hpp
@@ -62,7 +62,7 @@ class IndexedNodeTree {
return &m_btree->id;
}
- PointerRNA get_rna(bNode *bnode) const
+ PointerRNA rna(bNode *bnode) const
{
PointerRNA rna;
RNA_pointer_create(this->btree_id(), &RNA_Node, bnode, &rna);
@@ -222,7 +222,7 @@ class VirtualNode {
return &m_btree->id;
}
- PointerRNA get_rna()
+ PointerRNA rna()
{
PointerRNA rna;
RNA_pointer_create(&m_btree->id, &RNA_Node, m_bnode, &rna);
@@ -288,6 +288,13 @@ class VirtualSocket {
BLI_assert(m_vnode->m_backlink->is_frozen());
return m_links;
}
+
+ PointerRNA rna()
+ {
+ PointerRNA rna;
+ RNA_pointer_create(&m_btree->id, &RNA_NodeSocket, m_bsocket, &rna);
+ return rna;
+ }
};
class VirtualLink {
diff --git a/source/blender/functions/frontends/data_flow_nodes/builder.cpp b/source/blender/functions/frontends/data_flow_nodes/builder.cpp
index efc0e2c4712..c111de1ae35 100644
--- a/source/blender/functions/frontends/data_flow_nodes/builder.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/builder.cpp
@@ -220,24 +220,10 @@ std::string BTreeGraphBuilder::query_socket_name(VirtualSocket *vsocket) const
return vsocket->bsocket()->name;
}
-PointerRNA BTreeGraphBuilder::get_rna(VirtualNode *vnode) const
-{
- PointerRNA rna;
- RNA_pointer_create(vnode->btree_id(), &RNA_Node, vnode->bnode(), &rna);
- return rna;
-}
-
-PointerRNA BTreeGraphBuilder::get_rna(VirtualSocket *vsocket) const
-{
- PointerRNA rna;
- RNA_pointer_create(vsocket->btree_id(), &RNA_NodeSocket, vsocket->bsocket(), &rna);
- return rna;
-}
-
SharedType &BTreeGraphBuilder::query_type_property(VirtualNode *vnode,
StringRefNull prop_name) const
{
- PointerRNA rna = this->get_rna(vnode);
+ PointerRNA rna = vnode->rna();
return this->type_from_rna(rna, prop_name);
}
diff --git a/source/blender/functions/frontends/data_flow_nodes/builder.hpp b/source/blender/functions/frontends/data_flow_nodes/builder.hpp
index edb5420b679..71e58cc528f 100644
--- a/source/blender/functions/frontends/data_flow_nodes/builder.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/builder.hpp
@@ -56,13 +56,11 @@ class BTreeGraphBuilder {
VirtualNodeTree &vtree() const;
/* Query Socket Information */
- PointerRNA get_rna(VirtualSocket *vsocket) const;
bool is_data_socket(VirtualSocket *vsocket) const;
std::string query_socket_name(VirtualSocket *vsocket) const;
SharedType &query_socket_type(VirtualSocket *vsocket) const;
/* Query Node Information */
- PointerRNA get_rna(VirtualNode *vnode) const;
SharedType &query_type_property(VirtualNode *vnode, StringRefNull prop_name) const;
bool has_data_socket(VirtualNode *vnode) const;
diff --git a/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp b/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
index 9c54da6daac..e5a23173e5b 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
@@ -88,7 +88,7 @@ static SharedFunction &get_float_math_function(int operation)
static void INSERT_float_math(BTreeGraphBuilder &builder, VirtualNode *vnode)
{
- PointerRNA rna = builder.get_rna(vnode);
+ PointerRNA rna = vnode->rna();
int operation = RNA_enum_get(&rna, "operation");
SharedFunction &original_fn = get_float_math_function(operation);
@@ -123,7 +123,7 @@ static SharedFunction &get_vector_math_function(int operation)
static void INSERT_vector_math(BTreeGraphBuilder &builder, VirtualNode *vnode)
{
- PointerRNA rna = builder.get_rna(vnode);
+ PointerRNA rna = vnode->rna();
int operation = RNA_enum_get(&rna, "operation");
SharedFunction fn = get_vectorized_function(
@@ -172,7 +172,7 @@ static DFGB_Socket insert_pack_list_sockets(BTreeGraphBuilder &builder,
auto &empty_fn = Functions::GET_FN_empty_list(base_type);
DFGB_Node *node = builder.insert_function(empty_fn, vnode);
- PointerRNA rna = builder.get_rna(vnode);
+ PointerRNA rna = vnode->rna();
uint index = start_index;
RNA_BEGIN (&rna, itemptr, prop_name) {
@@ -214,7 +214,7 @@ static void INSERT_pack_list(BTreeGraphBuilder &builder, VirtualNode *vnode)
static void INSERT_call(BTreeGraphBuilder &builder, VirtualNode *vnode)
{
- PointerRNA rna = builder.get_rna(vnode);
+ PointerRNA rna = vnode->rna();
PointerRNA btree_ptr = RNA_pointer_get(&rna, "function_tree");
bNodeTree *btree = (bNodeTree *)btree_ptr.id.data;
@@ -239,7 +239,7 @@ static void INSERT_switch(BTreeGraphBuilder &builder, VirtualNode *vnode)
static void INSERT_combine_vector(BTreeGraphBuilder &builder, VirtualNode *vnode)
{
- PointerRNA rna = builder.get_rna(vnode);
+ PointerRNA rna = vnode->rna();
SharedFunction fn = get_vectorized_function(
Functions::GET_FN_combine_vector(),
rna,
@@ -251,7 +251,7 @@ static void INSERT_combine_vector(BTreeGraphBuilder &builder, VirtualNode *vnode
static void INSERT_separate_vector(BTreeGraphBuilder &builder, VirtualNode *vnode)
{
- PointerRNA rna = builder.get_rna(vnode);
+ PointerRNA rna = vnode->rna();
SharedFunction fn = get_vectorized_function(
Functions::GET_FN_separate_vector(),
rna,
@@ -272,7 +272,7 @@ static SharedFunction &get_compare_function(int operation)
static void INSERT_compare(BTreeGraphBuilder &builder, VirtualNode *vnode)
{
- PointerRNA rna = builder.get_rna(vnode);
+ PointerRNA rna = vnode->rna();
int operation = RNA_enum_get(&rna, "operation");
SharedFunction fn = get_vectorized_function(
get_compare_function(operation),
diff --git a/source/blender/simulations/bparticles/inserters.cpp b/source/blender/simulations/bparticles/inserters.cpp
index 64d4dc67a4f..6000e944d12 100644
--- a/source/blender/simulations/bparticles/inserters.cpp
+++ b/source/blender/simulations/bparticles/inserters.cpp
@@ -129,7 +129,7 @@ static std::unique_ptr<Action> BUILD_ACTION_explode(BuildContext &ctx, VirtualNo
SharedFunction fn = create_function_for_data_inputs(vnode, ctx.data_graph);
ParticleFunction particle_fn(fn);
- PointerRNA rna = vnode->get_rna();
+ PointerRNA rna = vnode->rna();
char name[65];
RNA_string_get(&rna, "particle_type_name", name);
@@ -202,7 +202,7 @@ static std::unique_ptr<Force> BUILD_FORCE_turbulence(BuildContext &ctx, VirtualN
static std::unique_ptr<Event> BUILD_EVENT_mesh_collision(BuildContext &ctx, VirtualNode *vnode)
{
- PointerRNA rna = vnode->get_rna();
+ PointerRNA rna = vnode->rna();
Object *object = (Object *)RNA_pointer_get(&rna, "object").id.data;
if (object == nullptr || object->type != OB_MESH) {
return {};
@@ -344,7 +344,7 @@ static std::unique_ptr<Emitter> BUILD_EMITTER_custom_function(BuildContext &ctx,
VirtualNode *vnode,
StringRef particle_type_name)
{
- PointerRNA rna = vnode->get_rna();
+ PointerRNA rna = vnode->rna();
bNodeTree *btree = (bNodeTree *)RNA_pointer_get(&rna, "function_tree").id.data;
if (btree == nullptr) {
return {};
@@ -393,7 +393,7 @@ static std::unique_ptr<Emitter> BUILD_EMITTER_initial_grid(BuildContext &ctx,
static std::unique_ptr<OffsetHandler> BUILD_OFFSET_HANDLER_trails(BuildContext &ctx,
VirtualNode *vnode)
{
- PointerRNA rna = vnode->get_rna();
+ PointerRNA rna = vnode->rna();
char name[65];
RNA_string_get(&rna, "particle_type_name", name);
More information about the Bf-blender-cvs
mailing list