[Bf-blender-cvs] [97997dd056a] functions: header cleanup
Jacques Lucke
noreply at git.blender.org
Thu Feb 28 12:41:39 CET 2019
Commit: 97997dd056af48dedba0bb5a9b06bc8aa4add367
Author: Jacques Lucke
Date: Thu Feb 28 12:40:20 2019 +0100
Branches: functions
https://developer.blender.org/rB97997dd056af48dedba0bb5a9b06bc8aa4add367
header cleanup
===================================================================
M source/blender/functions/CMakeLists.txt
M source/blender/functions/FN_all.hpp
A source/blender/functions/FN_functions.hpp
M source/blender/functions/nodes/test_nodes.cpp
===================================================================
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index 00244877026..f4e6ffc6f84 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -11,7 +11,12 @@ set(INC_SYS
)
set(SRC
+ FN_all.hpp
+ FN_core.hpp
+ FN_types.hpp
+ FN_functions.hpp
FN-C.h
+
c_wrapper.cpp
core/core.hpp
@@ -30,10 +35,6 @@ set(SRC
core/type_relations.hpp
core/type_relations.cpp
- FN_all.hpp
- FN_core.hpp
- FN_types.hpp
-
types/numeric.cpp
types/numeric.hpp
diff --git a/source/blender/functions/FN_all.hpp b/source/blender/functions/FN_all.hpp
index e81438fb102..cbbb4578bb2 100644
--- a/source/blender/functions/FN_all.hpp
+++ b/source/blender/functions/FN_all.hpp
@@ -1,4 +1,5 @@
#pragma once
#include "FN_core.hpp"
-#include "FN_types.hpp"
\ No newline at end of file
+#include "FN_types.hpp"
+#include "FN_functions.hpp"
\ No newline at end of file
diff --git a/source/blender/functions/FN_functions.hpp b/source/blender/functions/FN_functions.hpp
new file mode 100644
index 00000000000..e70482398a8
--- /dev/null
+++ b/source/blender/functions/FN_functions.hpp
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "./functions/object_input.hpp"
+#include "./functions/random.hpp"
+#include "./functions/scalar_math.hpp"
+#include "./functions/vectors.hpp"
\ No newline at end of file
diff --git a/source/blender/functions/nodes/test_nodes.cpp b/source/blender/functions/nodes/test_nodes.cpp
index 421aeb5016b..cc03ffe012f 100644
--- a/source/blender/functions/nodes/test_nodes.cpp
+++ b/source/blender/functions/nodes/test_nodes.cpp
@@ -1,12 +1,8 @@
#include "nodes.hpp"
-#include "BLI_lazy_init.hpp"
#include "RNA_access.h"
-#include "BLI_math.h"
-#include "functions/object_input.hpp"
-#include "functions/random.hpp"
-#include "functions/scalar_math.hpp"
-#include "functions/vectors.hpp"
+#include "FN_functions.hpp"
+#include "FN_types.hpp"
namespace FN { namespace Nodes {
More information about the Bf-blender-cvs
mailing list