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

Jacques Lucke noreply at git.blender.org
Thu Sep 26 16:51:28 CEST 2019


Commit: d942d6daa7370c8ccd7066a9855eeb6eeb9a2107
Author: Jacques Lucke
Date:   Thu Sep 26 12:03:29 2019 +0200
Branches: functions
https://developer.blender.org/rBd942d6daa7370c8ccd7066a9855eeb6eeb9a2107

rename file

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

R100	source/blender/blenkernel/BKE_node_tree.hpp	source/blender/blenkernel/BKE_virtual_node_tree_cxx.h
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/intern/node_tree.cpp
M	source/blender/functions/frontends/data_flow_nodes/mappings.hpp
M	source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.hpp
M	source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp
M	source/blender/simulations/bparticles/c_wrapper.cpp
M	source/blender/simulations/bparticles/node_frontend.cpp
M	source/blender/simulations/bparticles/node_frontend.hpp

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

diff --git a/source/blender/blenkernel/BKE_node_tree.hpp b/source/blender/blenkernel/BKE_virtual_node_tree_cxx.h
similarity index 100%
rename from source/blender/blenkernel/BKE_node_tree.hpp
rename to source/blender/blenkernel/BKE_virtual_node_tree_cxx.h
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 9593aa83f90..cb13e03fe44 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -325,7 +325,7 @@ set(SRC
   BKE_multires.h
   BKE_nla.h
   BKE_node.h
-  BKE_node_tree.hpp
+  BKE_virtual_node_tree_cxx.h
   BKE_object.h
   BKE_object_deform.h
   BKE_object_facemap.h
diff --git a/source/blender/blenkernel/intern/node_tree.cpp b/source/blender/blenkernel/intern/node_tree.cpp
index 4b26c0d4ac2..bb2d76f990a 100644
--- a/source/blender/blenkernel/intern/node_tree.cpp
+++ b/source/blender/blenkernel/intern/node_tree.cpp
@@ -1,4 +1,4 @@
-#include "BKE_node_tree.hpp"
+#include "BKE_virtual_node_tree_cxx.h"
 #include "BLI_timeit.h"
 
 namespace BKE {
diff --git a/source/blender/functions/frontends/data_flow_nodes/mappings.hpp b/source/blender/functions/frontends/data_flow_nodes/mappings.hpp
index 6f6c19f7cf4..e1eefba6e2a 100644
--- a/source/blender/functions/frontends/data_flow_nodes/mappings.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/mappings.hpp
@@ -4,7 +4,7 @@
 
 #include "BLI_string_map.h"
 #include "FN_tuple_call.hpp"
-#include "BKE_node_tree.hpp"
+#include "BKE_virtual_node_tree_cxx.h"
 
 namespace FN {
 namespace DataFlowNodes {
diff --git a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.hpp b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.hpp
index d4cf18ab24e..7284fcbe673 100644
--- a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "FN_core.hpp"
-#include "BKE_node_tree.hpp"
+#include "BKE_virtual_node_tree_cxx.h"
 #include "BLI_array_cxx.h"
 
 namespace FN {
diff --git a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp
index 9922e823d70..0f829cf3aa6 100644
--- a/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp
+++ b/source/blender/functions/frontends/data_flow_nodes/vtree_data_graph_builder.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "FN_core.hpp"
-#include "BKE_node_tree.hpp"
+#include "BKE_virtual_node_tree_cxx.h"
 #include "BLI_string_map.h"
 
 #include "vtree_data_graph.hpp"
diff --git a/source/blender/simulations/bparticles/c_wrapper.cpp b/source/blender/simulations/bparticles/c_wrapper.cpp
index 442420639c1..706fcc2bca4 100644
--- a/source/blender/simulations/bparticles/c_wrapper.cpp
+++ b/source/blender/simulations/bparticles/c_wrapper.cpp
@@ -10,7 +10,7 @@
 
 #include "BKE_mesh.h"
 #include "BKE_customdata.h"
-#include "BKE_node_tree.hpp"
+#include "BKE_virtual_node_tree_cxx.h"
 
 #include "DEG_depsgraph_query.h"
 
diff --git a/source/blender/simulations/bparticles/node_frontend.cpp b/source/blender/simulations/bparticles/node_frontend.cpp
index 2ee0a197bdc..b0ff5bfd5d2 100644
--- a/source/blender/simulations/bparticles/node_frontend.cpp
+++ b/source/blender/simulations/bparticles/node_frontend.cpp
@@ -1,4 +1,4 @@
-#include "BKE_node_tree.hpp"
+#include "BKE_virtual_node_tree_cxx.h"
 #include "BKE_deform.h"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
diff --git a/source/blender/simulations/bparticles/node_frontend.hpp b/source/blender/simulations/bparticles/node_frontend.hpp
index 7b3f0280822..d2ffdd4a368 100644
--- a/source/blender/simulations/bparticles/node_frontend.hpp
+++ b/source/blender/simulations/bparticles/node_frontend.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "BKE_node_tree.hpp"
+#include "BKE_virtual_node_tree_cxx.h"
 
 #include "world_state.hpp"
 #include "step_simulator.hpp"



More information about the Bf-blender-cvs mailing list