Commit: 73ceb30a98b1982f4522ca1cf402fe84b05e931a
Author: Jacques Lucke
Date: Fri Mar 1 16:08:57 2019 +0100
Branches: functions
https://developer.blender.org/rB73ceb30a98b1982f4522ca1cf402fe84b05e931a
cleanup
===================================================================
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/functions/core/dependencies.cpp
M source/blender/functions/core/dependencies.hpp
M source/blender/functions/functions/socket_input.cpp
===================================================================
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index bb6cd20bc0e..f42a8e21202 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1558,7 +1558,9 @@ void DepsgraphRelationBuilder::build_driver_variables(ID
*id, FCurve *fcu)
if (fn != NULL) {
FN::Dependencies dependencies;
fn->ptr()->body<FN::TupleCallBody>()->dependencies(dependencies);
- dependencies.add_relations(*this,
driver_key);
+ dependencies.add_relations(
+ (struct
DepsgraphRelationBuilderRef *)this,
+ (struct OperationKeyRef
*)&driver_key);
fn->decref();
}
}
diff --git a/source/blender/functions/core/dependencies.cpp
b/source/blender/functions/core/dependencies.cpp
index faffeac8362..698720b223f 100644
--- a/source/blender/functions/core/dependencies.cpp
+++ b/source/blender/functions/core/dependencies.cpp
@@ -1,9 +1,15 @@
#include "dependencies.hpp"
#include "DEG_depsgraph_build.h"
+#include "intern/builder/deg_builder_relations.h"
namespace FN {
+ void Dependencies::add_object_transform_dependency(struct Object
*object)
+ {
+ m_transform_dependencies.add(object);
+ }
+
void Dependencies::update_depsgraph(DepsNodeHandle *deps_node)
{
for (struct Object *ob : m_transform_dependencies) {
@@ -12,9 +18,12 @@ namespace FN {
}
void Dependencies::add_relations(
- DEG::DepsgraphRelationBuilder &builder,
- const DEG::OperationKey &target)
+ struct DepsgraphRelationBuilderRef *builder_,
+ const struct OperationKeyRef *target_)
{
+ auto builder = *(DEG::DepsgraphRelationBuilder *)builder_;
+ auto target = *(DEG::OperationKey *)target_;
+
for (struct Object *ob : m_transform_dependencies) {
DEG::OperationKey from_key(
(ID *)ob,
diff --git a/source/blender/functions/core/dependencies.hpp
b/source/blender/functions/core/dependencies.hpp
index 5922ba050ae..90d0b0259ec 100644
--- a/source/blender/functions/core/dependencies.hpp
+++ b/source/blender/functions/core/dependencies.hpp
@@ -1,9 +1,11 @@
-#include "BLI_small_set.hpp"
+#pragma once
-#include "intern/builder/deg_builder_relations.h"
+#include "BLI_small_set.hpp"
struct Object;
struct DepsNodeHandle;
+struct DepsgraphRelationBuilderRef;
+struct OperationKeyRef;
namespace FN {
using namespace BLI;
@@ -13,16 +15,13 @@ namespace FN {
SmallSet<struct Object *> m_transform_dependencies;
public:
- void add_object_transform_dependency(struct Object *object)
- {
- m_transform_dependencies.add(object);
- }
+ void add_object_transform_dependency(struct Object *object);
void update_depsgraph(DepsNodeHandle *deps_node);
void add_relations(
- DEG::DepsgraphRelationBuilder &builder,
- const DEG::OperationKey &target);
+ struct DepsgraphRelationBuilderRef *builder,
+ const struct OperationKeyRef *target);
};
} /* namespace FN */
\ No newline at end of file
diff --git a/source/blender/functions/functions/socket_input.cpp
b/source/blender/functions/functions/socket_input.cpp
index e61d4d3bc12..b81401c814c 100644
--- a/source/blender/functions/functions/socket_input.cpp
+++ b/source/blender/functions/functions/socket_input.cpp
@@ -3,6 +3,7 @@
#include "FN_types.hpp"
#include "FN_tuple_call.hpp"
#include "DNA_node_types.h"
+#include "RNA_access.h"
namespace FN { namespace Functions {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
