blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: white space around comment blocks

This commit is contained in:
Campbell Barton 2022-12-17 15:58:30 +11:00
parent a0a7db9f70
commit 0cc573c8c4
41 changed files with 68 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/integrator/shade_volume.h
View File

@ -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

1
source/blender/blenkernel/BKE_key.h
View File

@ -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]);

2
source/blender/blenkernel/BKE_particle.h
View File

@ -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 */

6
source/blender/blenkernel/BKE_pbvh.h
View File

@ -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;

2
source/blender/blenkernel/BKE_pointcache.h
View File

@ -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"

2
source/blender/blenkernel/intern/curves.cc
View File

@ -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,

4
source/blender/blenkernel/intern/dynamicpaint.c
View File

@ -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];

2
source/blender/blenkernel/intern/idprop.c
View File

@ -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");

4
source/blender/blenkernel/intern/key.cc
View File

@ -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);

2
source/blender/blenkernel/intern/multires.cc
View File

@ -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;

3
source/blender/blenkernel/intern/particle.c
View File

@ -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];

2
source/blender/blenkernel/intern/softbody.c
View File

@ -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 +++ */

6
source/blender/blenlib/intern/string_utf8.c
View File

@ -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 */

16
source/blender/blenlib/tests/BLI_string_utf8_test.cc
View File

@ -463,7 +463,7 @@ TEST(string, StrCursorStepNextUtf32AllCombining)
TEST(string, StrCursorStepNextUtf32Complex)
{
/* Combining character, "A", two combining characters, "B".*/
/* Combining character, "A", two combining characters, "B". */
const char32_t complex[] = U"\u0300\u0041\u0300\u0320\u0042";
const size_t len = 5;
int pos = 0;
@ -486,7 +486,7 @@ TEST(string, StrCursorStepNextUtf32Complex)
TEST(string, StrCursorStepNextUtf32Invalid)
{
/* Latin1 "À", tab, carriage return, linefeed, separated by combining characters.*/
/* Latin1 "À", tab, carriage return, linefeed, separated by combining characters. */
const char32_t invalid[] = U"\u00C0\u0300\u0009\u0300\u000D\u0300\u000A\u0300";
const size_t len = 8;
int pos = 0;
@ -573,7 +573,7 @@ TEST(string, StrCursorStepPrevUtf32AllCombining)
TEST(string, StrCursorStepPrevUtf32Complex)
{
/* Combining character, "A", two combining characters, "B".*/
/* Combining character, "A", two combining characters, "B". */
const char32_t complex[] = U"\u0300\u0041\u0300\u0320\u0042";
const size_t len = 5;
int pos = 5;
@ -596,7 +596,7 @@ TEST(string, StrCursorStepPrevUtf32Complex)
TEST(string, StrCursorStepPrevUtf32Invalid)
{
/* Latin1 "À", tab, carriage return, linefeed, separated by combining characters.*/
/* Latin1 "À", tab, carriage return, linefeed, separated by combining characters. */
const char32_t invalid[] = U"\u00C0\u0300\u0009\u0300\u000D\u0300\u000A\u0300";
const size_t len = 8;
int pos = 8;
@ -690,7 +690,7 @@ TEST(string, StrCursorStepNextUtf8AllCombining)
TEST(string, StrCursorStepNextUtf8AllComplex)
{
/* Combining character, "A", "©", two combining characters, "B".*/
/* Combining character, "A", "©", two combining characters, "B". */
const char complex[] = "\xCC\x80\x41\xC2\xA9\xCC\x80\xCC\xA0\x42";
const size_t len = 10;
int pos = 0;
@ -723,7 +723,7 @@ TEST(string, StrCursorStepNextUtf8AllComplex)
TEST(string, StrCursorStepNextUtf8Invalid)
{
/* Latin1 "À", combining, tab, carriage return, linefeed, combining.*/
/* Latin1 "À", combining, tab, carriage return, linefeed, combining. */
const char invalid[] = "\xC0\xCC\x80\x09\x0D\x0A\xCC\x80";
const size_t len = 8;
int pos = 0;
@ -818,7 +818,7 @@ TEST(string, StrCursorStepPrevUtf8AllCombining)
TEST(string, StrCursorStepPrevUtf8Complex)
{
/* Combining character, "A", "©", two combining characters, "B".*/
/* Combining character, "A", "©", two combining characters, "B". */
const char complex[] = "\xCC\x80\x41\xC2\xA9\xCC\x80\xCC\xA0\x42";
const size_t len = 10;
int pos = 10;
@ -851,7 +851,7 @@ TEST(string, StrCursorStepPrevUtf8Complex)
TEST(string, StrCursorStepPrevUtf8Invalid)
{
/* Latin1 "À", combining, tab, carriage return, linefeed, combining.*/
/* Latin1 "À", combining, tab, carriage return, linefeed, combining. */
const char invalid[] = "\xC0\xCC\x80\x09\x0D\x0A\xCC\x80";
const size_t len = 8;
int pos = 8;

2
source/blender/compositor/realtime_compositor/shaders/compositor_glare_ghost_accumulate.glsl
View File

@ -6,7 +6,7 @@ void main()
ivec2 input_size = texture_size(input_ghost_tx);
/* Add 0.5 to evaluate the input sampler at the center of the pixel and divide by the image size
* to get the coordinates into the sampler's expected [0, 1] range*/
* to get the coordinates into the sampler's expected [0, 1] range. */
vec2 coordinates = (vec2(texel) + vec2(0.5)) / input_size;
/* We accumulate four variants of the input ghost texture, each is scaled by some amount and

2
source/blender/compositor/realtime_compositor/shaders/compositor_glare_ghost_base.glsl
View File

@ -6,7 +6,7 @@ void main()
ivec2 input_size = texture_size(small_ghost_tx);
/* Add 0.5 to evaluate the input sampler at the center of the pixel and divide by the image size
* to get the coordinates into the sampler's expected [0, 1] range*/
* to get the coordinates into the sampler's expected [0, 1] range. */
vec2 coordinates = (vec2(texel) + vec2(0.5)) / input_size;
/* The small ghost is scaled down with the origin as the center of the image by a factor of 2.13,

2
source/blender/depsgraph/intern/builder/deg_builder_key.h
View File

@ -151,7 +151,7 @@ struct PersistentOperationKey : public OperationKey {
const IDNode *id_node = component_node->owner;
/* Copy names over to our object, so that the key stays valid even after the `operation_node`
* is destroyed.*/
* is destroyed. */
component_name_storage_ = component_node->name;
name_storage_ = operation_node->name;

2
source/blender/draw/engines/eevee/engine_eevee_shared_defines.h
View File

@ -21,7 +21,7 @@
/* Motion Blur. */
#define EEVEE_VELOCITY_TILE_SIZE 32
/* Depth of Field*/
/* Depth of Field. */
#define DOF_TILE_DIVISOR 16
#define DOF_BOKEH_LUT_SIZE 32
#define DOF_GATHER_RING_COUNT 5

2
source/blender/draw/engines/eevee/shaders/infos/eevee_legacy_common_info.hh
View File

@ -200,7 +200,7 @@ GPU_SHADER_CREATE_INFO(eevee_legacy_closure_eval_translucent_lib)
.additional_info("eevee_legacy_closure_eval_lib")
.additional_info("eevee_legacy_renderpass_lib");
/* eevee_legacy_closure_eval_surface_lib*/
/* eevee_legacy_closure_eval_surface_lib */
GPU_SHADER_CREATE_INFO(eevee_legacy_closure_eval_surface_lib)
.additional_info("eevee_legacy_closure_eval_diffuse_lib")
.additional_info("eevee_legacy_closure_eval_glossy_lib")

2
source/blender/draw/engines/eevee/shaders/surface_lib.glsl
View File

@ -45,7 +45,7 @@ out ShaderStageInterface{SURFACE_INTERFACE} dataOut;
dataOut.worldNormal = dataIn[vert].worldNormal; \
dataOut.viewNormal = dataIn[vert].viewNormal;
# else /* GPU_VERTEX_SHADER || GPU_FRAGMENT_SHADER*/
# else /* GPU_VERTEX_SHADER || GPU_FRAGMENT_SHADER */
IN_OUT ShaderStageInterface{SURFACE_INTERFACE};

2
source/blender/draw/engines/overlay/shaders/overlay_armature_shape_outline_vert_no_geom.glsl
View File

@ -143,7 +143,7 @@ void main()
* (avoid problems with point behind near plane).
* If the chosen point is parallel to the edge in screen space,
* choose the other point anyway.
* This fixes some issue with cubes in orthographic views.*/
* This fixes some issue with cubes in orthographic views. */
if (vPos[0].z < vPos[3].z) {
hidden_point = (abs(fac0) > 1e-5) ? ssPos[0] : ssPos[3];
}

4
source/blender/draw/engines/workbench/shaders/workbench_shadow_caps_vert_no_geom.glsl
View File

@ -2,10 +2,10 @@
#pragma USE_SSBO_VERTEX_FETCH(TriangleList, 6)
#ifdef DOUBLE_MANIFOLD
# define vert_len 6 /* Triangle Strip with 6 verts = 4 triangles = 12 verts*/
# define vert_len 6 /* Triangle Strip with 6 verts = 4 triangles = 12 verts. */
# define emit_triangle_count 2
#else
# define vert_len 6 /* Triangle Strip with 6 verts = 4 triangles = 12 verts*/
# define vert_len 6 /* Triangle Strip with 6 verts = 4 triangles = 12 verts. */
# define emit_triangle_count 2
#endif

6
source/blender/draw/engines/workbench/shaders/workbench_shadow_vert_no_geom.glsl
View File

@ -4,10 +4,10 @@
* geometry manifold type */
#ifdef DOUBLE_MANIFOLD
# define vert_len 12 /* Triangle Strip with 6 verts = 4 triangles = 12 verts*/
# define vert_len 12 /* Triangle Strip with 6 verts = 4 triangles = 12 verts. */
# define emit_triangle_count 4
#else
# define vert_len 6 /* Triang;e Strip with 4 verts = 2 triangles = 6 verts*/
# define vert_len 6 /* Triangle Strip with 4 verts = 2 triangles = 6 verts. */
# define emit_triangle_count 2
#endif
@ -157,4 +157,4 @@ void main()
DISCARD_VERTEX
#endif
}
}
}

2
source/blender/draw/intern/draw_pbvh.cc
View File

@ -984,7 +984,7 @@ struct PBVHBatches {
const blender::Span<MEdge> edges = args->me->edges();
/* Calculate number of edges*/
/* Calculate number of edges. */
int edge_count = 0;
for (int i = 0; i < args->totprim; i++) {
const MLoopTri *lt = args->mlooptri + args->prim_indices[i];

2
source/blender/draw/intern/draw_shader_shared.h
View File

@ -327,7 +327,7 @@ struct DRWDebugVert {
uint pos0;
uint pos1;
uint pos2;
/* Named vert_color to avoid global namespace collision with uniform color.*/
/* Named vert_color to avoid global namespace collision with uniform color. */
uint vert_color;
};
BLI_STATIC_ASSERT_ALIGN(DRWDebugVert, 16)

2
source/blender/draw/intern/draw_texture_pool.cc
View File

@ -49,7 +49,7 @@ GPUTexture *DRW_texture_pool_query(DRWTexturePool *pool,
eGPUTextureUsage usage,
void *user)
{
/* Texture pools have an implicit usage as a texture attachment*/
/* Texture pools have an implicit usage as a texture attachment. */
BLI_assert_msg(usage & GPU_TEXTURE_USAGE_ATTACHMENT,
"Pool textures must be of usage type attachment.");
usage = usage | GPU_TEXTURE_USAGE_ATTACHMENT;

2
source/blender/editors/gpencil/gpencil_fill.c
View File

@ -510,7 +510,7 @@ static void gpencil_stroke_collision(
const float connection_dist = tgpf->fill_extend_fac * 0.1f;
float diff_mat[4][4], inv_mat[4][4];
/* Transform matrix for original stroke.*/
/* Transform matrix for original stroke. */
BKE_gpencil_layer_transform_matrix_get(tgpf->depsgraph, tgpf->ob, gpl, diff_mat);
invert_m4_m4(inv_mat, diff_mat);

2
source/blender/editors/include/ED_anim_api.h
View File

@ -1052,7 +1052,7 @@ void ED_keymap_anim(struct wmKeyConfig *keyconf);
void ED_operatormacros_graph(void);
/* space_action */
void ED_operatormacros_action(void);
/* space_nla*/
/* space_nla */
void ED_operatormacros_nla(void);
/** \} */

2
source/blender/editors/interface/interface_templates.cc
View File

@ -5789,7 +5789,7 @@ void uiTemplateColorPicker(uiLayout *layout,
}
}
static void ui_template_palette_menu(bContext * /* C*/, uiLayout *layout, void * /*but_p*/)
static void ui_template_palette_menu(bContext * /*C*/, uiLayout *layout, void * /*but_p*/)
{
uiLayout *row;

2
source/blender/editors/sculpt_paint/sculpt.cc
View File

@ -639,7 +639,7 @@ void SCULPT_visibility_sync_all_from_faces(Object *ob)
BMIter iter;
BMFace *f;
/* Hide all verts and edges attached to faces.*/
/* Hide all verts and edges attached to faces. */
BM_ITER_MESH (f, &iter, ss->bm, BM_FACES_OF_MESH) {
BMLoop *l = f->l_first;
do {

2
source/blender/editors/sculpt_paint/sculpt_automasking.cc
View File

@ -774,7 +774,7 @@ static void sculpt_normal_occlusion_automasking_fill(AutomaskingCache *automaski
SculptSession *ss = ob->sculpt;
const int totvert = SCULPT_vertex_count_get(ss);
/* No need to build original data since this is only called at the beginning of strokes.*/
/* No need to build original data since this is only called at the beginning of strokes. */
AutomaskingNodeData nodedata;
nodedata.have_orig_data = false;

2
source/blender/editors/space_clip/clip_draw.c
View File

@ -978,7 +978,7 @@ static void draw_marker_slide_zones(SpaceClip *sc,
if ((sc->flag & SC_SHOW_MARKER_PATTERN) && ((track->pat_flag & SELECT) == sel || outline)) {
float pat_min[2], pat_max[2];
/* float dx = 12.0f / width, dy = 12.0f / height;*/ /* XXX UNUSED */
// float dx = 12.0f / width, dy = 12.0f / height; /*UNUSED*/
float tilt_ctrl[2];
if (!outline) {

2
source/blender/geometry/intern/uv_parametrizer.cc
View File

@ -3893,7 +3893,7 @@ void GEO_uv_parametrizer_face_add(ParamHandle *phandle,
int i1 = permute[(i + 1) % pm];
int i2 = permute[(i + 2) % pm];
if (!p_face_exists(phandle, vkeys, i0, i1, i2)) {
i--; /* ...All good...*/
i--; /* All good. */
continue;
}

2
source/blender/gpu/metal/mtl_command_buffer.mm
View File

@ -676,7 +676,7 @@ void MTLRenderPassState::bind_fragment_sampler(MTLSamplerBinding &sampler_bindin
BLI_assert(slot < MTL_MAX_TEXTURE_SLOTS);
UNUSED_VARS_NDEBUG(shader_interface);
/* If sampler state has not changed for the given slot, we do not need to fetch*/
/* If sampler state has not changed for the given slot, we do not need to fetch. */
if (this->cached_fragment_sampler_state_bindings[slot].sampler_state == nil ||
!(this->cached_fragment_sampler_state_bindings[slot].binding_state ==
sampler_binding.state) ||

12
source/blender/gpu/metal/mtl_shader.hh
View File

@ -637,15 +637,15 @@ inline bool mtl_convert_vertex_format(MTLVertexFormat shader_attrib_format,
out_vert_format = MTLVertexFormatChar4;
}
else if (shader_attrib_format == MTLVertexFormatInt3 && component_length == 3) {
/* Same as above case for matching length and signage (Len=3)*/
/* Same as above case for matching length and signage (Len=3). */
out_vert_format = MTLVertexFormatChar3;
}
else if (shader_attrib_format == MTLVertexFormatInt2 && component_length == 2) {
/* Same as above case for matching length and signage (Len=2)*/
/* Same as above case for matching length and signage (Len=2). */
out_vert_format = MTLVertexFormatChar2;
}
else if (shader_attrib_format == MTLVertexFormatInt && component_length == 1) {
/* Same as above case for matching length and signage (Len=1)*/
/* Same as above case for matching length and signage (Len=1). */
out_vert_format = MTLVertexFormatChar;
}
else if (shader_attrib_format == MTLVertexFormatInt && component_length == 4) {
@ -718,15 +718,15 @@ inline bool mtl_convert_vertex_format(MTLVertexFormat shader_attrib_format,
out_vert_format = MTLVertexFormatUChar4;
}
else if (shader_attrib_format == MTLVertexFormatUInt3 && component_length == 3) {
/* Same as above case for matching length and signage (Len=3)*/
/* Same as above case for matching length and signage (Len=3). */
out_vert_format = MTLVertexFormatUChar3;
}
else if (shader_attrib_format == MTLVertexFormatUInt2 && component_length == 2) {
/* Same as above case for matching length and signage (Len=2)*/
/* Same as above case for matching length and signage (Len=2). */
out_vert_format = MTLVertexFormatUChar2;
}
else if (shader_attrib_format == MTLVertexFormatUInt && component_length == 1) {
/* Same as above case for matching length and signage (Len=1)*/
/* Same as above case for matching length and signage (Len=1). */
out_vert_format = MTLVertexFormatUChar;
}
else if (shader_attrib_format == MTLVertexFormatInt && component_length == 4) {

2
source/blender/gpu/shaders/gpu_shader_3D_polyline_vert_no_geom.glsl
View File

@ -56,7 +56,7 @@ void main()
/* Index of the quad primitive. Each quad corresponds to one line in the input primitive. */
int quad_id = gl_VertexID / 6;
/* Determine vertex within the quad (A, B, C)(A, C, D).*/
/* Determine vertex within the quad (A, B, C)(A, C, D). */
int quad_vertex_id = gl_VertexID % 6;
uint src_index_a;

4
source/blender/gpu/vulkan/vk_storage_buffer.cc
View File

@ -23,7 +23,7 @@ void VKStorageBuffer::unbind()
{
}
void VKStorageBuffer::clear(eGPUTextureFormat /* internal_format*/,
void VKStorageBuffer::clear(eGPUTextureFormat /*internal_format*/,
eGPUDataFormat /*data_format*/,
void * /*data*/)
{
@ -39,4 +39,4 @@ void VKStorageBuffer::read(void * /*data*/)
{
}
} // namespace blender::gpu
} // namespace blender::gpu

5
source/blender/makesrna/intern/rna_nla.c
View File

@ -320,8 +320,9 @@ static void rna_NlaStrip_frame_end_ui_set(PointerRNA *ptr, float value)
float action_length_delta = (old_strip_end - data->end) / data->scale;
/* If no repeats are used, then modify the action end frame : */
if (IS_EQF(data->repeat, 1.0f)) {
/* If they're equal, strip has been reduced by the same amount as the whole strip length, so
* clamp the action clip length to 1 frame, and add a frame to end so that len(strip)!=0 :*/
/* If they're equal, strip has been reduced by the same amount as the whole strip length,
* so clamp the action clip length to 1 frame, and add a frame to end so that
* `len(strip) != 0`. */
if (IS_EQF(action_length_delta, actlen)) {
data->actend = data->actstart + 1.0f;
data->end += 1.0f;

2
source/blender/nodes/geometry/nodes/node_geo_dual_mesh.cc
View File

@ -136,7 +136,7 @@ static void transfer_attributes(
MutableAttributeAccessor dst_attributes)
{
/* Retrieve all attributes except for position which is handled manually.
* Remove anonymous attributes that don't need to be propagated.*/
* Remove anonymous attributes that don't need to be propagated. */
Set<AttributeIDRef> attribute_ids = src_attributes.all_ids();
attribute_ids.remove("position");
attribute_ids.remove_if([](const AttributeIDRef &id) { return !id.should_be_kept(); });

8
source/blender/python/intern/bpy_app_handlers.c
View File

@ -94,8 +94,10 @@ static PyStructSequence_Desc app_cb_info_desc = {
# endif
#endif
/* --------------------------------------------------------------------------*/
/* permanent tagging code */
/* -------------------------------------------------------------------- */
/** \name Permanent Tagging Code
* \{ */
#define PERMINENT_CB_ID "_bpy_persistent"
static PyObject *bpy_app_handlers_persistent_new(PyTypeObject *UNUSED(type),
@ -190,6 +192,8 @@ static PyTypeObject BPyPersistent_Type = {
/*tp_vectorcall*/ NULL,
};
/** \} */
static PyObject *py_cb_array[BKE_CB_EVT_TOT] = {NULL};
static PyObject *make_app_cb_info(void)

2
source/blender/python/mathutils/mathutils_Matrix.c
View File

@ -3795,7 +3795,7 @@ PyTypeObject matrix_access_Type = {
/*tp_doc*/ NULL,
/*tp_traverse*/ (traverseproc)MatrixAccess_traverse,
/*tp_clear*/ (inquiry)MatrixAccess_clear,
/*tp_richcompare*/ NULL /* MatrixAccess_richcmpr */ /* TODO*/,
/*tp_richcompare*/ NULL /* MatrixAccess_richcmpr */ /* TODO */,
/*tp_weaklistoffset*/ 0,
/*tp_iter*/ (getiterfunc)MatrixAccess_iter,
/*tp_iternext*/ NULL,