Commit: 6f96045c2f64dd3971ad23219022fdd0d4279e2a
Author: Jacques Lucke
Date: Sun Apr 7 00:01:41 2019 +0200
Branches: functions
https://developer.blender.org/rB6f96045c2f64dd3971ad23219022fdd0d4279e2a
rename ptr to rna to avoid confusing with actual pointers
===================================================================
M source/blender/functions/frontends/data_flow_nodes/builder.cpp
M source/blender/functions/frontends/data_flow_nodes/inserters.cpp
M source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
M source/blender/functions/frontends/data_flow_nodes/inserters/sockets.cpp
===================================================================
diff --git a/source/blender/functions/frontends/data_flow_nodes/builder.cpp
b/source/blender/functions/frontends/data_flow_nodes/builder.cpp
index 6021c687805..e2df3fe5e6e 100644
--- a/source/blender/functions/frontends/data_flow_nodes/builder.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/builder.cpp
@@ -12,18 +12,18 @@
#include <Python.h>
extern "C" {
- PyObject *pyrna_struct_CreatePyObject(PointerRNA *ptr);
+ PyObject *pyrna_struct_CreatePyObject(PointerRNA *rna);
}
#endif
#ifdef WITH_PYTHON
static PyObject *get_py_bnode(bNodeTree *btree, bNode *bnode)
{
- PointerRNA ptr;
+ PointerRNA rna;
RNA_pointer_create(
&btree->id, &RNA_Node,
- bnode, &ptr);
- return pyrna_struct_CreatePyObject(&ptr);
+ bnode, &rna);
+ return pyrna_struct_CreatePyObject(&rna);
}
#endif
@@ -223,8 +223,8 @@ namespace FN { namespace DataFlowNodes {
bool GraphBuilder::is_data_socket(bNodeSocket *bsocket) const
{
- PointerRNA ptr = this->get_rna(bsocket);
- return RNA_struct_find_property(&ptr, "data_type") != NULL;
+ PointerRNA rna = this->get_rna(bsocket);
+ return RNA_struct_find_property(&rna, "data_type") != NULL;
}
SharedType &GraphBuilder::type_by_name(const char *data_type) const
@@ -269,20 +269,20 @@ namespace FN { namespace DataFlowNodes {
PointerRNA GraphBuilder::get_rna(bNode *bnode) const
{
- PointerRNA ptr;
+ PointerRNA rna;
RNA_pointer_create(
this->btree_id(), &RNA_Node,
- bnode, &ptr);
- return ptr;
+ bnode, &rna);
+ return rna;
}
PointerRNA GraphBuilder::get_rna(bNodeSocket *bsocket) const
{
- PointerRNA ptr;
+ PointerRNA rna;
RNA_pointer_create(
this->btree_id(), &RNA_NodeSocket,
- bsocket, &ptr);
- return ptr;
+ bsocket, &rna);
+ return rna;
}
SharedType &GraphBuilder::query_type_property(bNode *bnode, const char
*prop_name) const
@@ -301,9 +301,9 @@ namespace FN { namespace DataFlowNodes {
std::string GraphBuilder::query_socket_type_name(bNodeSocket *bsocket)
const
{
BLI_assert(this->is_data_socket(bsocket));
- PointerRNA ptr = this->get_rna(bsocket);
+ PointerRNA rna = this->get_rna(bsocket);
char type_name[64];
- RNA_string_get(&ptr, "data_type", type_name);
+ RNA_string_get(&rna, "data_type", type_name);
return type_name;
}
diff --git a/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
b/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
index 8aa7a522f41..71fc415ba9c 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters.cpp
@@ -113,13 +113,13 @@ namespace FN { namespace DataFlowNodes {
void call(Tuple &UNUSED(fn_in), Tuple &fn_out, ExecutionContext
&UNUSED(ctx)) const override
{
for (uint i = 0; i < m_bsockets.size(); i++) {
- PointerRNA ptr;
+ PointerRNA rna;
bNodeSocket *bsocket = m_bsockets[i];
auto loader = m_loaders[i];
RNA_pointer_create(&m_btree->id,
- &RNA_NodeSocket, bsocket, &ptr);
- loader(&ptr, fn_out, i);
+ &RNA_NodeSocket, bsocket, &rna);
+ loader(&rna, fn_out, i);
}
}
};
@@ -134,10 +134,10 @@ namespace FN { namespace DataFlowNodes {
for (uint i = 0; i < bsockets.size(); i++) {
bNodeSocket *bsocket = bsockets[i];
- PointerRNA ptr = builder.get_rna(bsocket);
+ PointerRNA rna = builder.get_rna(bsocket);
char data_type[64];
- RNA_string_get(&ptr, "data_type", data_type);
+ RNA_string_get(&rna, "data_type", data_type);
SocketLoader loader =
m_socket_loaders.lookup(data_type);
loaders.append(loader);
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 dbe9d31367d..ab6a6abe3f6 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters/nodes.cpp
@@ -38,8 +38,8 @@ namespace FN { namespace DataFlowNodes {
static void INSERT_object_transforms(GraphBuilder &builder, bNode
*bnode)
{
- PointerRNA ptr = builder.get_rna(bnode);
- Object *object = (Object *)RNA_pointer_get(&ptr,
"object").id.data;
+ PointerRNA rna = builder.get_rna(bnode);
+ Object *object = (Object *)RNA_pointer_get(&rna,
"object").id.data;
auto fn = Functions::GET_FN_object_location(object);
builder.insert_matching_function(fn, bnode);
}
@@ -131,10 +131,10 @@ namespace FN { namespace DataFlowNodes {
auto &empty_fn = Functions::GET_FN_empty_list(base_type);
Node *node = builder.insert_function(empty_fn, bnode);
- PointerRNA ptr = builder.get_rna(bnode);
+ PointerRNA rna = builder.get_rna(bnode);
uint index = start_index;
- RNA_BEGIN(&ptr, itemptr, prop_name)
+ RNA_BEGIN(&rna, itemptr, prop_name)
{
Node *new_node;
int state = RNA_enum_get(&itemptr, "state");
@@ -174,9 +174,9 @@ namespace FN { namespace DataFlowNodes {
static void INSERT_call(GraphBuilder &builder, bNode *bnode)
{
- PointerRNA ptr = builder.get_rna(bnode);
+ PointerRNA rna = builder.get_rna(bnode);
- PointerRNA btree_ptr = RNA_pointer_get(&ptr, "function_tree");
+ PointerRNA btree_ptr = RNA_pointer_get(&rna, "function_tree");
bNodeTree *btree = (bNodeTree *)btree_ptr.id.data;
if (btree == nullptr) {
diff --git
a/source/blender/functions/frontends/data_flow_nodes/inserters/sockets.cpp
b/source/blender/functions/frontends/data_flow_nodes/inserters/sockets.cpp
index b5bb5ca94de..9511a0df8eb 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters/sockets.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters/sockets.cpp
@@ -7,33 +7,33 @@
namespace FN { namespace DataFlowNodes {
- static void LOAD_float(PointerRNA *ptr, Tuple &tuple, uint index)
+ static void LOAD_float(PointerRNA *rna, Tuple &tuple, uint index)
{
- float value = RNA_float_get(ptr, "value");
+ float value = RNA_float_get(rna, "value");
tuple.set<float>(index, value);
}
- static void LOAD_vector(PointerRNA *ptr, Tuple &tuple, uint index)
+ static void LOAD_vector(PointerRNA *rna, Tuple &tuple, uint index)
{
float vector[3];
- RNA_float_get_array(ptr, "value", vector);
+ RNA_float_get_array(rna, "value", vector);
tuple.set<Types::Vector>(index, Types::Vector(vector));
}
- static void LOAD_integer(PointerRNA *ptr, Tuple &tuple, uint index)
+ static void LOAD_integer(PointerRNA *rna, Tuple &tuple, uint index)
{
- int value = RNA_int_get(ptr, "value");
+ int value = RNA_int_get(rna, "value");
tuple.set<int32_t>(index, value);
}
- static void LOAD_boolean(PointerRNA *ptr, Tuple &tuple, uint index)
+ static void LOAD_boolean(PointerRNA *rna, Tuple &tuple, uint index)
{
- bool value = RNA_boolean_get(ptr, "value");
+ bool value = RNA_boolean_get(rna, "value");
tuple.set<bool>(index, value);
}
template<typename T>
- static void LOAD_empty_list(PointerRNA *UNUSED(ptr), Tuple &tuple, uint
index)
+ static void LOAD_empty_list(PointerRNA *UNUSED(rna), Tuple &tuple, uint
index)
{
auto list = Types::SharedList<T>::New();
tuple.move_in(index, list);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
