[Bf-blender-cvs] [09e1175aa1b] temp-T97352-3d-texturing-seam-bleeding-b2: Cleanup: make format
Dalai Felinto
noreply at git.blender.org
Mon Jul 11 15:36:19 CEST 2022
Commit: 09e1175aa1b91540dadb3a6cd13ac873b26315e9
Author: Dalai Felinto
Date: Fri Jul 8 15:07:24 2022 +0200
Branches: temp-T97352-3d-texturing-seam-bleeding-b2
https://developer.blender.org/rB09e1175aa1b91540dadb3a6cd13ac873b26315e9
Cleanup: make format
===================================================================
M source/blender/blenkernel/intern/customdata.cc
M source/blender/blenkernel/intern/particle.c
M source/blender/draw/engines/overlay/overlay_shader.c
M source/blender/draw/intern/draw_cache_impl_particles.c
===================================================================
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc
index 26fbd7d7b54..277218033e9 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -3550,8 +3550,6 @@ void CustomData_bmesh_update_active_layers(CustomData *fdata, CustomData *ldata)
}
}
-
-
void CustomData_bmesh_init_pool(CustomData *data, int totelem, const char htype)
{
int chunksize;
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index b5ff12f3caa..2471d3baa59 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -58,13 +58,13 @@
#include "BKE_main.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
+#include "BKE_mesh_legacy_convert.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
#include "BKE_scene.h"
#include "BKE_texture.h"
-#include "BKE_mesh_legacy_convert.h"
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_build.h"
diff --git a/source/blender/draw/engines/overlay/overlay_shader.c b/source/blender/draw/engines/overlay/overlay_shader.c
index faa76ff74b6..2373363ab9d 100644
--- a/source/blender/draw/engines/overlay/overlay_shader.c
+++ b/source/blender/draw/engines/overlay/overlay_shader.c
@@ -659,7 +659,7 @@ GPUShader *OVERLAY_shader_outline_prepass_curves()
if (!sh_data->outline_prepass_curves) {
sh_data->outline_prepass_curves = GPU_shader_create_from_info_name(
draw_ctx->sh_cfg ? "overlay_outline_prepass_curves_clipped" :
- "overlay_outline_prepass_curves");
+ "overlay_outline_prepass_curves");
}
return sh_data->outline_prepass_curves;
}
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c b/source/blender/draw/intern/draw_cache_impl_particles.c
index 16201e809c7..dee7a8cec37 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -24,9 +24,9 @@
#include "BKE_customdata.h"
#include "BKE_mesh.h"
+#include "BKE_mesh_legacy_convert.h"
#include "BKE_particle.h"
#include "BKE_pointcache.h"
-#include "BKE_mesh_legacy_convert.h"
#include "ED_particle.h"
More information about the Bf-blender-cvs
mailing list