[Bf-blender-cvs] [a5bc1b002f0] functions: rename file

Jacques Lucke noreply at git.blender.org
Wed Jul 31 18:45:12 CEST 2019


Commit: a5bc1b002f005d0210bbb945903452e917aa149f
Author: Jacques Lucke
Date:   Wed Jul 31 17:21:43 2019 +0200
Branches: functions
https://developer.blender.org/rBa5bc1b002f005d0210bbb945903452e917aa149f

rename file

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

M	source/blender/functions/CMakeLists.txt
M	source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
M	source/blender/functions/frontends/data_flow_nodes/inserters.hpp
R099	source/blender/functions/frontends/data_flow_nodes/builder.cpp	source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
R100	source/blender/functions/frontends/data_flow_nodes/builder.hpp	source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp

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

diff --git a/source/blender/functions/CMakeLists.txt b/source/blender/functions/CMakeLists.txt
index 6472d3dc1a9..85972fec3dd 100644
--- a/source/blender/functions/CMakeLists.txt
+++ b/source/blender/functions/CMakeLists.txt
@@ -139,8 +139,8 @@ set(SRC
   functions/color.hpp
   functions/color.cpp
 
-  frontends/data_flow_nodes/builder.hpp
-  frontends/data_flow_nodes/builder.cpp
+  frontends/data_flow_nodes/vtree_data_graph_builder.hpp
+  frontends/data_flow_nodes/vtree_data_graph_builder.cpp
   frontends/data_flow_nodes/function_generation.hpp
   frontends/data_flow_nodes/function_generation.cpp
   frontends/data_flow_nodes/graph_generation.hpp
diff --git a/source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp b/source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
index 7f9bf7650bc..99603c1c075 100644
--- a/source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/graph_generation.hpp
@@ -4,8 +4,8 @@
 #include "BLI_value_or_error.hpp"
 #include "BKE_node_tree.hpp"
 
-#include "builder.hpp"
 #include "vtree_data_graph.hpp"
+#include "vtree_data_graph_builder.hpp"
 
 namespace FN {
 namespace DataFlowNodes {
diff --git a/source/blender/functions/frontends/data_flow_nodes/inserters.hpp b/source/blender/functions/frontends/data_flow_nodes/inserters.hpp
index 968ee2eeebc..2419317667d 100644
--- a/source/blender/functions/frontends/data_flow_nodes/inserters.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/inserters.hpp
@@ -1,11 +1,13 @@
 #pragma once
 
-#include "builder.hpp"
 #include <functional>
+
 #include "BLI_optional.hpp"
 #include "BLI_string_map.hpp"
 #include "FN_tuple_call.hpp"
 
+#include "vtree_data_graph_builder.hpp"
+
 struct PointerRNA;
 
 namespace FN {
diff --git a/source/blender/functions/frontends/data_flow_nodes/builder.cpp b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
similarity index 99%
rename from source/blender/functions/frontends/data_flow_nodes/builder.cpp
rename to source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
index 32c8f2213a6..d85a9d5f547 100644
--- a/source/blender/functions/frontends/data_flow_nodes/builder.cpp
+++ b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.cpp
@@ -1,12 +1,11 @@
-#include "builder.hpp"
-#include "type_mappings.hpp"
+#include <sstream>
 
 #include "DNA_node_types.h"
-#include "FN_types.hpp"
-
 #include "RNA_access.h"
+#include "FN_types.hpp"
 
-#include <sstream>
+#include "vtree_data_graph_builder.hpp"
+#include "type_mappings.hpp"
 
 #ifdef WITH_PYTHON
 #  include <Python.h>
diff --git a/source/blender/functions/frontends/data_flow_nodes/builder.hpp b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp
similarity index 100%
rename from source/blender/functions/frontends/data_flow_nodes/builder.hpp
rename to source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp



More information about the Bf-blender-cvs mailing list