[Bf-blender-cvs] [4b1532b0644] functions-experimental-refactor: move file

[Jacques Lucke]

Commit: 4b1532b0644f98a0fde11908acf332cec82ef8a9
Author: Jacques Lucke
Date:   Sat Nov 2 18:53:29 2019 +0100
Branches: functions-experimental-refactor
https://developer.blender.org/rB4b1532b0644f98a0fde11908acf332cec82ef8a9

move file

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

M	source/blender/functions2/CMakeLists.txt
R097	source/blender/functions2/FN_vtree_multi_function_network_builder.h	source/blender/functions2/intern/vtree_multi_function_network/builder.h
M	source/blender/functions2/intern/vtree_multi_function_network/generate.cc
M	source/blender/functions2/intern/vtree_multi_function_network/mappings.h

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

diff --git a/source/blender/functions2/CMakeLists.txt b/source/blender/functions2/CMakeLists.txt
index 0e7630be401..22f3cc677d0 100644
--- a/source/blender/functions2/CMakeLists.txt
+++ b/source/blender/functions2/CMakeLists.txt
@@ -45,13 +45,13 @@ set(SRC
   FN_multi_function_network.h
   FN_multi_function.h
   FN_multi_functions.h
-  FN_vtree_multi_function_network_builder.h
   FN_vtree_multi_function_network_generation.h
   FN_vtree_multi_function_network.h
 
   intern/multi_functions/lists.h
   intern/multi_functions/mixed.h
   intern/multi_functions/network.h
+  intern/vtree_multi_function_network/builder.h
   intern/vtree_multi_function_network/mappings.h
   intern/cpp_types.h
 )
diff --git a/source/blender/functions2/FN_vtree_multi_function_network_builder.h b/source/blender/functions2/intern/vtree_multi_function_network/builder.h
similarity index 97%
rename from source/blender/functions2/FN_vtree_multi_function_network_builder.h
rename to source/blender/functions2/intern/vtree_multi_function_network/builder.h
index cc5ff7ddcef..f54cac6c961 100644
--- a/source/blender/functions2/FN_vtree_multi_function_network_builder.h
+++ b/source/blender/functions2/intern/vtree_multi_function_network/builder.h
@@ -1,5 +1,4 @@
-#ifndef __FN_VTREE_MULTI_FUNCTION_NETWORK_BUILDER_H__
-#define __FN_VTREE_MULTI_FUNCTION_NETWORK_BUILDER_H__
+#pragma once
 
 #include "FN_vtree_multi_function_network.h"
 
@@ -222,5 +221,3 @@ class VTreeMFNetworkBuilder {
 };
 
 }  // namespace FN
-
-#endif /* __FN_VTREE_MULTI_FUNCTION_NETWORK_BUILDER_H__ */
diff --git a/source/blender/functions2/intern/vtree_multi_function_network/generate.cc b/source/blender/functions2/intern/vtree_multi_function_network/generate.cc
index 2750c2dc0cd..6b8bc9390c9 100644
--- a/source/blender/functions2/intern/vtree_multi_function_network/generate.cc
+++ b/source/blender/functions2/intern/vtree_multi_function_network/generate.cc
@@ -1,4 +1,3 @@
-#include "FN_vtree_multi_function_network_builder.h"
 #include "FN_vtree_multi_function_network_generation.h"
 #include "FN_multi_functions.h"
 
diff --git a/source/blender/functions2/intern/vtree_multi_function_network/mappings.h b/source/blender/functions2/intern/vtree_multi_function_network/mappings.h
index 67e410765f4..6af29056a9f 100644
--- a/source/blender/functions2/intern/vtree_multi_function_network/mappings.h
+++ b/source/blender/functions2/intern/vtree_multi_function_network/mappings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "FN_vtree_multi_function_network_builder.h"
+#include "builder.h"
 
 #include "BLI_map.h"
 #include "BLI_owned_resources.h"