[Bf-blender-cvs] [060a6c0e062] functions: rename function headers

Jacques Lucke noreply at git.blender.org
Thu Feb 28 12:41:37 CET 2019 

Commit: 060a6c0e0621d2d1c8e6a41261d87a5472996a7a
Author: Jacques Lucke
Date:   Thu Feb 28 12:31:34 2019 +0100
Branches: functions
https://developer.blender.org/rB060a6c0e0621d2d1c8e6a41261d87a5472996a7a

rename function headers

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

M	source/blender/blenkernel/intern/fcurve.c
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/functions/CMakeLists.txt
R100	source/blender/functions/FN_functions.h	source/blender/functions/FN-C.h
A	source/blender/functions/FN_all.hpp
R100	source/blender/functions/FN_functions_core.hpp	source/blender/functions/FN_core.hpp
D	source/blender/functions/FN_functions.hpp
R100	source/blender/functions/FN_functions_types.hpp	source/blender/functions/FN_types.hpp
M	source/blender/functions/c_wrapper.cpp
M	source/blender/functions/functions/object_input.cpp
M	source/blender/functions/functions/object_input.hpp
M	source/blender/functions/functions/random.cpp
M	source/blender/functions/functions/random.hpp
M	source/blender/functions/functions/scalar_math.cpp
M	source/blender/functions/functions/scalar_math.hpp
M	source/blender/functions/functions/vectors.cpp
M	source/blender/functions/functions/vectors.hpp
M	source/blender/functions/nodes/nodes.hpp
M	source/blender/functions/types/numeric.hpp
M	source/blender/modifiers/intern/MOD_displace.c
M	source/blender/modifiers/intern/MOD_functiondeform.c
M	source/creator/creator.c

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

diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index bbdebf22c04..6eeba6c9efd 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -57,7 +57,7 @@
 
 #include "RNA_access.h"
 
-#include "FN_functions.h"
+#include "FN-C.h"
 
 #include "atomic_ops.h"
 
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index 71cf96f88d8..bb6cd20bc0e 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -111,7 +111,7 @@ extern "C" {
 
 #include "intern/depsgraph_type.h"
 
-#include "FN_functions.hpp"
+#include "FN_all.hpp"
 
 namespace DEG {
 
diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index d3228a4bd39..00244877026 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -11,7 +11,7 @@ set(INC_SYS
 )
 
 set(SRC
-	FN_functions.h
+	FN-C.h
 	c_wrapper.cpp
 
 	core/core.hpp
@@ -30,9 +30,9 @@ set(SRC
 	core/type_relations.hpp
 	core/type_relations.cpp
 
-	FN_functions.hpp
-	FN_functions_core.hpp
-	FN_functions_types.hpp
+	FN_all.hpp
+	FN_core.hpp
+	FN_types.hpp
 
 	types/numeric.cpp
 	types/numeric.hpp
diff --git a/source/blender/functions/FN_functions.h b/source/blender/functions/FN-C.h
similarity index 100%
rename from source/blender/functions/FN_functions.h
rename to source/blender/functions/FN-C.h
diff --git a/source/blender/functions/FN_all.hpp b/source/blender/functions/FN_all.hpp
new file mode 100644
index 00000000000..e81438fb102
--- /dev/null
+++ b/source/blender/functions/FN_all.hpp
@@ -0,0 +1,4 @@
+#pragma once
+
+#include "FN_core.hpp"
+#include "FN_types.hpp"
\ No newline at end of file
diff --git a/source/blender/functions/FN_functions_core.hpp b/source/blender/functions/FN_core.hpp
similarity index 100%
rename from source/blender/functions/FN_functions_core.hpp
rename to source/blender/functions/FN_core.hpp
diff --git a/source/blender/functions/FN_functions.hpp b/source/blender/functions/FN_functions.hpp
deleted file mode 100644
index f7e51bd5114..00000000000
--- a/source/blender/functions/FN_functions.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#include "FN_functions_core.hpp"
-#include "FN_functions_types.hpp"
\ No newline at end of file
diff --git a/source/blender/functions/FN_functions_types.hpp b/source/blender/functions/FN_types.hpp
similarity index 100%
rename from source/blender/functions/FN_functions_types.hpp
rename to source/blender/functions/FN_types.hpp
diff --git a/source/blender/functions/c_wrapper.cpp b/source/blender/functions/c_wrapper.cpp
index 9c30243befa..9ad1e46441d 100644
--- a/source/blender/functions/c_wrapper.cpp
+++ b/source/blender/functions/c_wrapper.cpp
@@ -1,5 +1,5 @@
-#include "FN_functions.h"
-#include "FN_functions.hpp"
+#include "FN-C.h"
+#include "FN_all.hpp"
 
 #include "nodes/nodes.hpp"
 #include "nodes/graph_generation.hpp"
diff --git a/source/blender/functions/functions/object_input.cpp b/source/blender/functions/functions/object_input.cpp
index 8c35f5d809e..3a432fda75f 100644
--- a/source/blender/functions/functions/object_input.cpp
+++ b/source/blender/functions/functions/object_input.cpp
@@ -1,5 +1,5 @@
 #include "object_input.hpp"
-#include "FN_functions_types.hpp"
+#include "FN_types.hpp"
 
 #include "BLI_lazy_init.hpp"
 #include "DNA_object_types.h"
diff --git a/source/blender/functions/functions/object_input.hpp b/source/blender/functions/functions/object_input.hpp
index 3df19de52c7..9166e7e9b93 100644
--- a/source/blender/functions/functions/object_input.hpp
+++ b/source/blender/functions/functions/object_input.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "FN_functions_core.hpp"
+#include "FN_core.hpp"
 
 struct Object;
 
diff --git a/source/blender/functions/functions/random.cpp b/source/blender/functions/functions/random.cpp
index b223975530e..017ac4e204d 100644
--- a/source/blender/functions/functions/random.cpp
+++ b/source/blender/functions/functions/random.cpp
@@ -1,5 +1,5 @@
 #include "random.hpp"
-#include "FN_functions_types.hpp"
+#include "FN_types.hpp"
 
 #include "BLI_lazy_init.hpp"
 
diff --git a/source/blender/functions/functions/random.hpp b/source/blender/functions/functions/random.hpp
index dff671f80fa..4a89c363209 100644
--- a/source/blender/functions/functions/random.hpp
+++ b/source/blender/functions/functions/random.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "FN_functions_core.hpp"
+#include "FN_core.hpp"
 
 namespace FN { namespace Functions {
 
diff --git a/source/blender/functions/functions/scalar_math.cpp b/source/blender/functions/functions/scalar_math.cpp
index f510ba6bb32..50cb753c015 100644
--- a/source/blender/functions/functions/scalar_math.cpp
+++ b/source/blender/functions/functions/scalar_math.cpp
@@ -1,5 +1,5 @@
 #include "scalar_math.hpp"
-#include "FN_functions_types.hpp"
+#include "FN_types.hpp"
 
 #include "BLI_lazy_init.hpp"
 
diff --git a/source/blender/functions/functions/scalar_math.hpp b/source/blender/functions/functions/scalar_math.hpp
index 85947b88fc6..7a4d54c9d4c 100644
--- a/source/blender/functions/functions/scalar_math.hpp
+++ b/source/blender/functions/functions/scalar_math.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "FN_functions_core.hpp"
+#include "FN_core.hpp"
 
 namespace FN { namespace Functions {
 
diff --git a/source/blender/functions/functions/vectors.cpp b/source/blender/functions/functions/vectors.cpp
index 97d3cef7ca8..3fb873d5396 100644
--- a/source/blender/functions/functions/vectors.cpp
+++ b/source/blender/functions/functions/vectors.cpp
@@ -1,5 +1,5 @@
 #include "vectors.hpp"
-#include "FN_functions_types.hpp"
+#include "FN_types.hpp"
 
 #include "BLI_lazy_init.hpp"
 #include "BLI_math.h"
diff --git a/source/blender/functions/functions/vectors.hpp b/source/blender/functions/functions/vectors.hpp
index fefcc78e27f..ae31cb9885e 100644
--- a/source/blender/functions/functions/vectors.hpp
+++ b/source/blender/functions/functions/vectors.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "FN_functions_core.hpp"
+#include "FN_core.hpp"
 
 namespace FN { namespace Functions {
 
diff --git a/source/blender/functions/nodes/nodes.hpp b/source/blender/functions/nodes/nodes.hpp
index bea5ab841c6..2bdc31dca83 100644
--- a/source/blender/functions/nodes/nodes.hpp
+++ b/source/blender/functions/nodes/nodes.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "FN_functions.hpp"
+#include "FN_all.hpp"
 #include "BKE_node.h"
 #include "BLI_listbase_wrapper.hpp"
 #include <functional>
diff --git a/source/blender/functions/types/numeric.hpp b/source/blender/functions/types/numeric.hpp
index af59d031920..472cd5f05ba 100644
--- a/source/blender/functions/types/numeric.hpp
+++ b/source/blender/functions/types/numeric.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../FN_functions_core.hpp"
+#include "../FN_core.hpp"
 
 namespace FN { namespace Types {
 
diff --git a/source/blender/modifiers/intern/MOD_displace.c b/source/blender/modifiers/intern/MOD_displace.c
index 35f7cfd8a85..662254ca342 100644
--- a/source/blender/modifiers/intern/MOD_displace.c
+++ b/source/blender/modifiers/intern/MOD_displace.c
@@ -51,7 +51,7 @@
 
 #include "RE_shader_ext.h"
 
-#include "FN_functions.h"
+#include "FN-C.h"
 
 
 /* Displace */
diff --git a/source/blender/modifiers/intern/MOD_functiondeform.c b/source/blender/modifiers/intern/MOD_functiondeform.c
index 0043eaed474..50ba14443c6 100644
--- a/source/blender/modifiers/intern/MOD_functiondeform.c
+++ b/source/blender/modifiers/intern/MOD_functiondeform.c
@@ -50,7 +50,7 @@
 #include "DEG_depsgraph_query.h"
 #include "time.h"
 
-#include "FN_functions.h"
+#include "FN-C.h"
 
 static FnFunction get_current_function(FunctionDeformModifierData *fdmd)
 {
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 6550a0293c6..fde416a3541 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -76,7 +76,7 @@
 
 #include "RNA_define.h"
 
-#include "FN_functions.h"
+#include "FN-C.h"
 
 #ifdef WITH_FREESTYLE
 #  include "FRS_freestyle.h"

More information about the Bf-blender-cvs mailing list