[Bf-blender-cvs] [3138c7c5d79] functions: rename files

Jacques Lucke noreply at git.blender.org
Wed Jun 19 13:27:34 CEST 2019


Commit: 3138c7c5d7912c4b90b13e78263886873e964826
Author: Jacques Lucke
Date:   Wed Jun 19 10:39:02 2019 +0200
Branches: functions
https://developer.blender.org/rB3138c7c5d7912c4b90b13e78263886873e964826

rename files

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

M	source/blender/simulations/CMakeLists.txt
M	source/blender/simulations/bparticles/c_wrapper.cpp
R098	source/blender/simulations/bparticles/emitter.cpp	source/blender/simulations/bparticles/emitters.cpp
R100	source/blender/simulations/bparticles/emitter.hpp	source/blender/simulations/bparticles/emitters.hpp

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

diff --git a/source/blender/simulations/CMakeLists.txt b/source/blender/simulations/CMakeLists.txt
index ba0bbf23d0e..3ef9df3a6ba 100644
--- a/source/blender/simulations/CMakeLists.txt
+++ b/source/blender/simulations/CMakeLists.txt
@@ -21,8 +21,8 @@ set(SRC
   bparticles/particles_container.cpp
   bparticles/playground_solver.hpp
   bparticles/playground_solver.cpp
-  bparticles/emitter.hpp
-  bparticles/emitter.cpp
+  bparticles/emitters.hpp
+  bparticles/emitters.cpp
   bparticles/attributes.hpp
   bparticles/attributes.cpp
   bparticles/c_wrapper.cpp
diff --git a/source/blender/simulations/bparticles/c_wrapper.cpp b/source/blender/simulations/bparticles/c_wrapper.cpp
index 7315705683d..635e7d51c74 100644
--- a/source/blender/simulations/bparticles/c_wrapper.cpp
+++ b/source/blender/simulations/bparticles/c_wrapper.cpp
@@ -2,7 +2,7 @@
 #include "core.hpp"
 #include "particles_container.hpp"
 #include "playground_solver.hpp"
-#include "emitter.hpp"
+#include "emitters.hpp"
 #include "BLI_noise.h"
 #include "BLI_timeit.hpp"
 
diff --git a/source/blender/simulations/bparticles/emitter.cpp b/source/blender/simulations/bparticles/emitters.cpp
similarity index 98%
rename from source/blender/simulations/bparticles/emitter.cpp
rename to source/blender/simulations/bparticles/emitters.cpp
index cfae437f943..27905ee27e3 100644
--- a/source/blender/simulations/bparticles/emitter.cpp
+++ b/source/blender/simulations/bparticles/emitters.cpp
@@ -1,4 +1,4 @@
-#include "emitter.hpp"
+#include "emitters.hpp"
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"
 #include "BKE_mesh_runtime.h"
diff --git a/source/blender/simulations/bparticles/emitter.hpp b/source/blender/simulations/bparticles/emitters.hpp
similarity index 100%
rename from source/blender/simulations/bparticles/emitter.hpp
rename to source/blender/simulations/bparticles/emitters.hpp



More information about the Bf-blender-cvs mailing list