[Bf-blender-cvs] [0cc573c8c42] master: Cleanup: white space around comment blocks
Campbell Barton
noreply at git.blender.org
Sat Dec 17 06:20:51 CET 2022
Commit: 0cc573c8c42ab96ed8cab23606fa22d3b959da08
Author: Campbell Barton
Date: Sat Dec 17 15:58:30 2022 +1100
Branches: master
https://developer.blender.org/rB0cc573c8c42ab96ed8cab23606fa22d3b959da08
Cleanup: white space around comment blocks
===================================================================
M intern/cycles/kernel/integrator/shade_volume.h
M source/blender/blenkernel/BKE_key.h
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/BKE_pointcache.h
M source/blender/blenkernel/intern/curves.cc
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/idprop.c
M source/blender/blenkernel/intern/key.cc
M source/blender/blenkernel/intern/multires.cc
M source/blender/blenkernel/intern/particle.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenlib/intern/string_utf8.c
M source/blender/blenlib/tests/BLI_string_utf8_test.cc
M source/blender/compositor/realtime_compositor/shaders/compositor_glare_ghost_accumulate.glsl
M source/blender/compositor/realtime_compositor/shaders/compositor_glare_ghost_base.glsl
M source/blender/depsgraph/intern/builder/deg_builder_key.h
M source/blender/draw/engines/eevee/engine_eevee_shared_defines.h
M source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh
M source/blender/draw/engines/eevee/shaders/surface_lib.glsl
M source/blender/draw/engines/overlay/shaders/overlay_armature_shape_outline_vert_no_geom.glsl
M source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert_no_geom.glsl
M source/blender/draw/engines/workbench/shaders/workbench_shadow_vert_no_geom.glsl
M source/blender/draw/intern/draw_pbvh.cc
M source/blender/draw/intern/draw_shader_shared.h
M source/blender/draw/intern/draw_texture_pool.cc
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/include/ED_anim_api.h
M source/blender/editors/interface/interface_templates.cc
M source/blender/editors/sculpt_paint/sculpt.cc
M source/blender/editors/sculpt_paint/sculpt_automasking.cc
M source/blender/editors/space_clip/clip_draw.c
M source/blender/geometry/intern/uv_parametrizer.cc
M source/blender/gpu/metal/mtl_command_buffer.mm
M source/blender/gpu/metal/mtl_shader.hh
M source/blender/gpu/shaders/gpu_shader_3D_polyline_vert_no_geom.glsl
M source/blender/gpu/vulkan/vk_storage_buffer.cc
M source/blender/makesrna/intern/rna_nla.c
M source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc
M source/blender/python/intern/bpy_app_handlers.c
M source/blender/python/mathutils/mathutils_Matrix.c
===================================================================
diff --git a/intern/cycles/kernel/integrator/shade_volume.h b/intern/cycles/kernel/integrator/shade_volume.h
index 0323738c09b..456bebe771a 100644
--- a/intern/cycles/kernel/integrator/shade_volume.h
+++ b/intern/cycles/kernel/integrator/shade_volume.h
@@ -1030,7 +1030,7 @@ ccl_device VolumeIntegrateEvent volume_integrate(KernelGlobals kg,
const float3 initial_throughput = INTEGRATOR_STATE(state, path, throughput);
/* The path throughput used to calculate the throughput for direct light. */
float3 unlit_throughput = initial_throughput;
- /* If a new path segment is generated at the direct scatter position.*/
+ /* If a new path segment is generated at the direct scatter position. */
bool guiding_generated_new_segment = false;
float rand_phase_guiding = 0.5f;
# endif
diff --git a/source/blender/blenkernel/BKE_key.h b/source/blender/blenkernel/BKE_key.h
index 813dc9aba34..7fb3e71ad3d 100644
--- a/source/blender/blenkernel/BKE_key.h
+++ b/source/blender/blenkernel/BKE_key.h
@@ -157,6 +157,7 @@ void BKE_keyblock_convert_from_vertcos(const struct Object *ob,
const float (*vertCos)[3]);
float (*BKE_keyblock_convert_to_vertcos(const struct Object *ob, const struct KeyBlock *kb))[3];
+/** RAW coordinates offsets. */
void BKE_keyblock_update_from_offset(const struct Object *ob,
struct KeyBlock *kb,
const float (*ofs)[3]);
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index 05b9aca7544..618e69b5436 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -665,7 +665,7 @@ float psys_get_current_display_percentage(struct ParticleSystem *psys, bool use_
/* psys_reset */
#define PSYS_RESET_ALL 1
#define PSYS_RESET_DEPSGRAPH 2
-/* #define PSYS_RESET_CHILDREN 3 */ /*UNUSED*/
+// #define PSYS_RESET_CHILDREN 3 /*UNUSED*/
#define PSYS_RESET_CACHE_MISS 4
/* index_dmcache */
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index 8f66d552387..a1e1253bd54 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -71,7 +71,7 @@ struct PBVHPublic {
/* A generic PBVH vertex.
*
- * Note: in PBVH_GRIDS we consider the final grid points
+ * NOTE: in PBVH_GRIDS we consider the final grid points
* to be vertices. This is not true of edges or faces which are pulled from
* the base mesh.
*/
@@ -79,12 +79,12 @@ typedef struct PBVHVertRef {
intptr_t i;
} PBVHVertRef;
-/* Note: edges in PBVH_GRIDS are always pulled from the base mesh.*/
+/* NOTE: edges in PBVH_GRIDS are always pulled from the base mesh. */
typedef struct PBVHEdgeRef {
intptr_t i;
} PBVHEdgeRef;
-/* Note: faces in PBVH_GRIDS are always puled from the base mesh.*/
+/* NOTE: faces in PBVH_GRIDS are always puled from the base mesh. */
typedef struct PBVHFaceRef {
intptr_t i;
} PBVHFaceRef;
diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h
index 4331a25c112..79a3bdf7c3c 100644
--- a/source/blender/blenkernel/BKE_pointcache.h
+++ b/source/blender/blenkernel/BKE_pointcache.h
@@ -27,7 +27,7 @@ extern "C" {
#define PTCACHE_RESET_DEPSGRAPH 0
#define PTCACHE_RESET_BAKED 1
#define PTCACHE_RESET_OUTDATED 2
-/* #define PTCACHE_RESET_FREE 3 */ /*UNUSED*/
+// #define PTCACHE_RESET_FREE 3 /*UNUSED*/
/* Add the blend-file name after `blendcache_`. */
#define PTCACHE_EXT ".bphys"
diff --git a/source/blender/blenkernel/intern/curves.cc b/source/blender/blenkernel/intern/curves.cc
index 8d3f90230f6..84ffb5e5314 100644
--- a/source/blender/blenkernel/intern/curves.cc
+++ b/source/blender/blenkernel/intern/curves.cc
@@ -203,7 +203,7 @@ IDTypeInfo IDType_ID_CV = {
/* id_filter */ FILTER_ID_CV,
/* main_listbase_index */ INDEX_ID_CV,
/* struct_size */ sizeof(Curves),
- /* name*/ "Curves",
+ /* name */ "Curves",
/* name_plural */ "hair_curves",
/* translation_context */ BLT_I18NCONTEXT_ID_CURVES,
/* flags */ IDTYPE_FLAGS_APPEND_IS_REUSABLE,
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index e0ae3f42be6..ef8a4990842 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -3029,7 +3029,7 @@ int dynamicPaint_createUVSurface(Scene *scene,
#if 0
/* -----------------------------------------------------------------
* For debug, write a dump of adjacency data to a file.
- * -----------------------------------------------------------------*/
+ * ----------------------------------------------------------------- */
FILE *dump_file = fopen("dynpaint-adj-data.txt", "w");
int *tmp = MEM_callocN(sizeof(int) * active_points, "tmp");
for (int ty = 0; ty < h; ty++) {
@@ -3140,7 +3140,7 @@ int dynamicPaint_createUVSurface(Scene *scene,
#if 0
/* -----------------------------------------------------------------
* For debug, output pixel statuses to the color map
- * -----------------------------------------------------------------*/
+ * ----------------------------------------------------------------- */
for (index = 0; index < sData->total_points; index++) {
ImgSeqFormatData *f_data = (ImgSeqFormatData *)sData->format_data;
PaintUVPoint *uvPoint = &((PaintUVPoint *)f_data->uv_p)[index];
diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c
index f876caf9d91..00e7425c8af 100644
--- a/source/blender/blenkernel/intern/idprop.c
+++ b/source/blender/blenkernel/intern/idprop.c
@@ -58,8 +58,6 @@ static size_t idp_size_table[] = {
#define GETPROP(prop, i) &(IDP_IDPArray(prop)[i])
-/* --------- property array type -------------*/
-
IDProperty *IDP_NewIDPArray(const char *name)
{
IDProperty *prop = MEM_callocN(sizeof(IDProperty), "IDProperty prop array");
diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc
index 26cec31e177..99010c70e90 100644
--- a/source/blender/blenkernel/intern/key.cc
+++ b/source/blender/blenkernel/intern/key.cc
@@ -2472,8 +2472,6 @@ float (*BKE_keyblock_convert_to_vertcos(const Object *ob, const KeyBlock *kb))[3
return vertCos;
}
-/************************* raw coord offsets ************************/
-
void BKE_keyblock_update_from_offset(const Object *ob, KeyBlock *kb, const float (*ofs)[3])
{
int a;
@@ -2509,8 +2507,6 @@ void BKE_keyblock_update_from_offset(const Object *ob, KeyBlock *kb, const float
}
}
-/* ==========================================================*/
-
bool BKE_keyblock_move(Object *ob, int org_index, int new_index)
{
Key *key = BKE_key_from_object(ob);
diff --git a/source/blender/blenkernel/intern/multires.cc b/source/blender/blenkernel/intern/multires.cc
index 3700432696a..8ba8b657a16 100644
--- a/source/blender/blenkernel/intern/multires.cc
+++ b/source/blender/blenkernel/intern/multires.cc
@@ -670,7 +670,7 @@ static void multires_del_higher(MultiresModifierData *mmd, Object *ob, int lvl)
if (mdisps && levels > 0) {
if (lvl > 0) {
- /* MLoop *ml = me->mloop; */ /*UNUSED*/
+ // MLoop *ml = me->mloop; /*UNUSED*/
int nsize = multires_side_tot[lvl];
int hsize = multires_side_tot[mmd->totlvl];
int i, j;
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 6a277295efd..f9abe7de830 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -3332,7 +3332,8 @@ void psys_cache_paths(ParticleSimulationData *sim, float cfra, const bool use_re
PARTICLE_P;
float birthtime = 0.0, dietime = 0.0;
- float t, time = 0.0, dfra = 1.0 /* , frs_sec = sim->scene->r.frs_sec*/ /*UNUSED*/;
+ float t, time = 0.0, dfra = 1.0;
+ // float frs_sec = sim->scene->r.frs_sec; /*UNUSED*/
float col[4] = {0.5f, 0.5f, 0.5f, 1.0f};
float prev_tangent[3] = {0.0f, 0.0f, 0.0f}, hairmat[4][4];
float rotmat[3][3];
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index efe423ccfc5..0a6cb1a8556 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -233,7 +233,7 @@ static float _final_mass(Object *ob, BodyPoint *bp)
CLOG_ERROR(&LOG, "sb or bp == NULL");
return 1.0f;
}
-/* helper functions for everything is animateble jow_go_for2_5 ------*/
+/* Helper functions for everything is animateble jow_go_for2_5. */
/* +++ collider caching and dicing +++ */
diff --git a/source/blender/blenlib/intern/string_utf8.c b/source/blender/blenlib/intern/string_utf8.c
index 26facda7abf..e2124ad4931 100644
--- a/source/blender/blenlib/intern/string_utf8.c
+++ b/source/blender/blenlib/intern/string_utf8.c
@@ -267,7 +267,7 @@ size_t BLI_strncpy_utf8_rlen(char *__restrict dst, const char *__restrict src, s
#undef BLI_STR_UTF8_CPY
-/* --------------------------------------------------------------------------*/
+/* -------------------------------------------------------------------- */
/* wchar_t / utf8 functions */
size_t BLI_strncpy_wchar_as_utf8(char *__restrict dst,
@@ -359,7 +359,7 @@ size_t BLI_strncpy_wchar_from_utf8(wchar_t *__restrict dst_w,
}
/* end wchar_t / utf8 functions */
-/* --------------------------------------------------------------------------*/
+/* -------------------------------------------------------------------- */
int BLI_wcwidth(char32_t ucs)
{
@@ -399,7 +399,7 @@ int BLI_str_utf8_char_width_safe(const char *p)
return (columns < 0) ? 1 : columns;
}
-/* --------------------------------------------------------------------------*/
+/* -------------------------------------------------------------------- */
/* copied from glib's gutf8.c, added 'Err' arg */
diff --git a/source/blender/blenlib/tests/BLI_string_utf8_test.cc b/source/blender/blenlib/tests/BLI_string_utf8_test.cc
index d66bade40ed..2b032ec0982 100644
--- a/source/blender/blenlib/tests/BLI_string_utf8_test.cc
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list