[Bf-blender-cvs] [99d0b3b7937] master: Cleanup: GPU: Rename gpu_texture_smoke to fluid, and move back to C
Clément Foucault
noreply at git.blender.org
Wed Jul 29 15:55:05 CEST 2020
Commit: 99d0b3b79377d38d3936fd9beba8d647e938f0c1
Author: Clément Foucault
Date: Wed Jul 29 15:06:38 2020 +0200
Branches: master
https://developer.blender.org/rB99d0b3b79377d38d3936fd9beba8d647e938f0c1
Cleanup: GPU: Rename gpu_texture_smoke to fluid, and move back to C
The file do not have a reason to be C++ anymore.
===================================================================
M source/blender/gpu/CMakeLists.txt
R100 source/blender/gpu/intern/gpu_texture_smoke.cc source/blender/gpu/intern/gpu_texture_fluid.c
R100 source/blender/gpu/intern/gpu_texture_image.cc source/blender/gpu/intern/gpu_texture_image.c
===================================================================
diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt
index 925c873181f..179d003facd 100644
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@ -80,8 +80,8 @@ set(SRC
intern/gpu_shader_interface.c
intern/gpu_state.cc
intern/gpu_texture.cc
- intern/gpu_texture_image.cc
- intern/gpu_texture_smoke.cc
+ intern/gpu_texture_image.c
+ intern/gpu_texture_fluid.c
intern/gpu_uniformbuffer.cc
intern/gpu_vertex_buffer.cc
intern/gpu_vertex_format.cc
diff --git a/source/blender/gpu/intern/gpu_texture_smoke.cc b/source/blender/gpu/intern/gpu_texture_fluid.c
similarity index 100%
rename from source/blender/gpu/intern/gpu_texture_smoke.cc
rename to source/blender/gpu/intern/gpu_texture_fluid.c
diff --git a/source/blender/gpu/intern/gpu_texture_image.cc b/source/blender/gpu/intern/gpu_texture_image.c
similarity index 100%
rename from source/blender/gpu/intern/gpu_texture_image.cc
rename to source/blender/gpu/intern/gpu_texture_image.c
More information about the Bf-blender-cvs
mailing list