diff options
-rw-r--r-- | intern/cycles/blender/image.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/device/metal/device_impl.mm | 3 | ||||
-rw-r--r-- | intern/cycles/device/optix/device_impl.cpp | 4 | ||||
-rw-r--r-- | intern/cycles/scene/image_vdb.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/scene/shader_graph.cpp | 12 | ||||
-rw-r--r-- | intern/guardedalloc/MEM_guardedalloc.h | 4 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 4 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee_next/eevee_defines.hh | 2 | ||||
-rw-r--r-- | source/blender/draw/engines/eevee_next/eevee_velocity.cc | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache_impl_subdivision.cc | 4 | ||||
-rw-r--r-- | source/blender/gpu/metal/mtl_state.mm | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_lineart_types.h | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_particlesystem.cc | 7 |
13 files changed, 32 insertions, 28 deletions
diff --git a/intern/cycles/blender/image.cpp b/intern/cycles/blender/image.cpp index e01b72c1653..e802fd39335 100644 --- a/intern/cycles/blender/image.cpp +++ b/intern/cycles/blender/image.cpp @@ -19,7 +19,7 @@ BlenderImageLoader::BlenderImageLoader(BL::Image b_image, frame(frame), tile_number(tile_number), /* Don't free cache for preview render to avoid race condition from T93560, to be fixed - properly later as we are close to release. */ + * properly later as we are close to release. */ free_cache(!is_preview_render && !b_image.has_data()) { } diff --git a/intern/cycles/device/metal/device_impl.mm b/intern/cycles/device/metal/device_impl.mm index e1438a9d6e2..16aabacb4cf 100644 --- a/intern/cycles/device/metal/device_impl.mm +++ b/intern/cycles/device/metal/device_impl.mm @@ -697,8 +697,7 @@ void MetalDevice::tex_alloc_as_buffer(device_texture &mem) void MetalDevice::tex_alloc(device_texture &mem) { /* Check that dimensions fit within maximum allowable size. - See https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf - */ + * See: https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf */ if (mem.data_width > 16384 || mem.data_height > 16384) { set_error(string_printf( "Texture exceeds maximum allowed size of 16384 x 16384 (requested: %zu x %zu)", diff --git a/intern/cycles/device/optix/device_impl.cpp b/intern/cycles/device/optix/device_impl.cpp index ad2a361a056..35717c49d1a 100644 --- a/intern/cycles/device/optix/device_impl.cpp +++ b/intern/cycles/device/optix/device_impl.cpp @@ -1237,7 +1237,7 @@ bool OptiXDevice::denoise_configure_if_needed(DenoiseContext &context) const OptixResult result = optixDenoiserSetup( denoiser_.optix_denoiser, 0, /* Work around bug in r495 drivers that causes artifacts when denoiser setup is called - on a stream that is not the default stream */ + * on a stream that is not the default stream. */ tile_size.x + denoiser_.sizes.overlapWindowSizeInPixels * 2, tile_size.y + denoiser_.sizes.overlapWindowSizeInPixels * 2, denoiser_.state.device_pointer, @@ -1912,7 +1912,7 @@ void OptiXDevice::build_bvh(BVH *bvh, Progress &progress, bool refit) { /* Can disable __anyhit__kernel_optix_visibility_test by default (except for thick curves, * since it needs to filter out end-caps there). - + * * It is enabled where necessary (visibility mask exceeds 8 bits or the other any-hit * programs like __anyhit__kernel_optix_shadow_all_hit) via OPTIX_RAY_FLAG_ENFORCE_ANYHIT. */ diff --git a/intern/cycles/scene/image_vdb.cpp b/intern/cycles/scene/image_vdb.cpp index d0b41a239df..2209be60a97 100644 --- a/intern/cycles/scene/image_vdb.cpp +++ b/intern/cycles/scene/image_vdb.cpp @@ -114,9 +114,11 @@ bool VDBImageLoader::load_metadata(const ImageDeviceFeatures &features, ImageMet # ifdef WITH_NANOVDB if (features.has_nanovdb) { /* NanoVDB expects no inactive leaf nodes. */ - /*openvdb::FloatGrid &pruned_grid = *openvdb::gridPtrCast<openvdb::FloatGrid>(grid); +# if 0 + openvdb::FloatGrid &pruned_grid = *openvdb::gridPtrCast<openvdb::FloatGrid>(grid); openvdb::tools::pruneInactive(pruned_grid.tree()); - nanogrid = nanovdb::openToNanoVDB(pruned_grid);*/ + nanogrid = nanovdb::openToNanoVDB(pruned_grid); +# endif ToNanoOp op; op.precision = precision; if (!openvdb::grid_type_operation(grid, op)) { diff --git a/intern/cycles/scene/shader_graph.cpp b/intern/cycles/scene/shader_graph.cpp index d44e12f5fab..f25d0b7c7b9 100644 --- a/intern/cycles/scene/shader_graph.cpp +++ b/intern/cycles/scene/shader_graph.cpp @@ -888,7 +888,7 @@ void ShaderGraph::default_inputs(bool do_osl) void ShaderGraph::refine_bump_nodes() { - /* we transverse the node graph looking for bump nodes, when we find them, + /* We transverse the node graph looking for bump nodes, when we find them, * like in bump_from_displacement(), we copy the sub-graph defined from "bump" * input to the inputs "center","dx" and "dy" What is in "bump" input is moved * to "center" input. */ @@ -898,18 +898,18 @@ void ShaderGraph::refine_bump_nodes() ShaderInput *bump_input = node->input("Height"); ShaderNodeSet nodes_bump; - /* make 2 extra copies of the subgraph defined in Bump input */ + /* Make 2 extra copies of the subgraph defined in Bump input. */ ShaderNodeMap nodes_dx; ShaderNodeMap nodes_dy; - /* find dependencies for the given input */ + /* Find dependencies for the given input. */ find_dependencies(nodes_bump, bump_input); copy_nodes(nodes_bump, nodes_dx); copy_nodes(nodes_bump, nodes_dy); - /* mark nodes to indicate they are use for bump computation, so - that any texture coordinates are shifted by dx/dy when sampling */ + /* Mark nodes to indicate they are use for bump computation, so + * that any texture coordinates are shifted by dx/dy when sampling. */ foreach (ShaderNode *node, nodes_bump) node->bump = SHADER_BUMP_CENTER; foreach (NodePair &pair, nodes_dx) @@ -924,7 +924,7 @@ void ShaderGraph::refine_bump_nodes() connect(out_dx, node->input("SampleX")); connect(out_dy, node->input("SampleY")); - /* add generated nodes */ + /* Add generated nodes. */ foreach (NodePair &pair, nodes_dx) add(pair.second); foreach (NodePair &pair, nodes_dy) diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index 8cd2c9f94dd..fca19fb9731 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -55,8 +55,8 @@ extern void (*MEM_freeN)(void *vmemh); #if 0 /* UNUSED */ /** - * Return zero if memory is not in allocated list - */ + * Return zero if memory is not in allocated list + */ extern short (*MEM_testN)(void *vmemh); #endif diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index 83d325e9c40..fa6b0571326 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -2487,8 +2487,8 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) /* Rebuild active/render color attribute references. */ if (!MAIN_VERSION_ATLEAST(bmain, 302, 6)) { LISTBASE_FOREACH (Brush *, br, &bmain->brushes) { - /* buggy code in wm_toolsystem broke smear in old files, - reset to defaults */ + /* Buggy code in wm_toolsystem broke smear in old files, + * reset to defaults. */ if (br->sculpt_tool == SCULPT_TOOL_SMEAR) { br->alpha = 1.0f; br->spacing = 5; diff --git a/source/blender/draw/engines/eevee_next/eevee_defines.hh b/source/blender/draw/engines/eevee_next/eevee_defines.hh index 7141928a20d..f75ebd2bd13 100644 --- a/source/blender/draw/engines/eevee_next/eevee_defines.hh +++ b/source/blender/draw/engines/eevee_next/eevee_defines.hh @@ -12,7 +12,7 @@ #pragma once /** - Number of items in a culling batch. Needs to be Power of 2. Must be <= to 65536. + * Number of items in a culling batch. Needs to be Power of 2. Must be <= to 65536. * Current limiting factor is the sorting phase which is single pass and only sort within a * thread-group which maximum size is 1024. */ diff --git a/source/blender/draw/engines/eevee_next/eevee_velocity.cc b/source/blender/draw/engines/eevee_next/eevee_velocity.cc index 9f8dce43910..ceae9df44d0 100644 --- a/source/blender/draw/engines/eevee_next/eevee_velocity.cc +++ b/source/blender/draw/engines/eevee_next/eevee_velocity.cc @@ -185,7 +185,7 @@ void VelocityModule::step_swap() dst_ofs += src_len; } /* TODO(@fclem): Fail gracefully (disable motion blur + warning print) if - `tot_len * sizeof(float4)` is greater than max SSBO size. */ + * `tot_len * sizeof(float4)` is greater than max SSBO size. */ geometry_steps[step_]->resize(max_ii(16, dst_ofs)); for (VelocityGeometryData &geom : geometry_map.values()) { diff --git a/source/blender/draw/intern/draw_cache_impl_subdivision.cc b/source/blender/draw/intern/draw_cache_impl_subdivision.cc index 99da06aa6b1..0cee50ec8b0 100644 --- a/source/blender/draw/intern/draw_cache_impl_subdivision.cc +++ b/source/blender/draw/intern/draw_cache_impl_subdivision.cc @@ -794,8 +794,8 @@ struct DRWCacheBuildingContext { int *edge_origindex_map; /* #CD_ORIGINDEX layers from the mesh to directly look up during traversal the original-index - from the base mesh for edit data so that we do not have to handle yet another GPU buffer and - do this in the shaders. */ + * from the base mesh for edit data so that we do not have to handle yet another GPU buffer and + * do this in the shaders. */ const int *v_origindex; const int *e_origindex; }; diff --git a/source/blender/gpu/metal/mtl_state.mm b/source/blender/gpu/metal/mtl_state.mm index 5f52bc55f72..fa2f5c54391 100644 --- a/source/blender/gpu/metal/mtl_state.mm +++ b/source/blender/gpu/metal/mtl_state.mm @@ -532,9 +532,11 @@ void MTLStateManager::set_blend(const eGPUBlend value) /* NOTE(Metal): Granular option for specifying before/after stages for a barrier * Would be a useful feature. */ -/*void MTLStateManager::issue_barrier(eGPUBarrier barrier_bits, +#if 0 +void MTLStateManager::issue_barrier(eGPUBarrier barrier_bits, eGPUStageBarrierBits before_stages, - eGPUStageBarrierBits after_stages) */ + eGPUStageBarrierBits after_stages) +#endif void MTLStateManager::issue_barrier(eGPUBarrier barrier_bits) { /* NOTE(Metal): The Metal API implicitly tracks dependencies between resources. diff --git a/source/blender/makesdna/DNA_lineart_types.h b/source/blender/makesdna/DNA_lineart_types.h index 5b3a23000d7..df496269644 100644 --- a/source/blender/makesdna/DNA_lineart_types.h +++ b/source/blender/makesdna/DNA_lineart_types.h @@ -48,8 +48,8 @@ typedef enum eLineartEdgeFlag { LRT_EDGE_FLAG_INTERSECTION = (1 << 4), LRT_EDGE_FLAG_LOOSE = (1 << 5), /* LRT_EDGE_FLAG_FOR_FUTURE = (1 << 7), */ - /* Limited to 8 bits for edge type flag, don't add anymore because BMEdge->head.eflag only has 8 - bits. So unless we changed this into a non-single-bit flag thing, we keep it this way. */ + /* Limited to 8 bits for edge type flag, don't add anymore because `BMEdge->head.eflag` only has + * 8 bits. So unless we changed this into a non-single-bit flag thing, we keep it this way. */ /** Also used as discarded line mark. */ LRT_EDGE_FLAG_CHAIN_PICKED = (1 << 8), LRT_EDGE_FLAG_CLIPPED = (1 << 9), diff --git a/source/blender/modifiers/intern/MOD_particlesystem.cc b/source/blender/modifiers/intern/MOD_particlesystem.cc index c6a606360e3..f410915cad8 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.cc +++ b/source/blender/modifiers/intern/MOD_particlesystem.cc @@ -306,9 +306,10 @@ ModifierTypeInfo modifierType_ParticleSystem = { /* srna */ &RNA_ParticleSystemModifier, /* type */ eModifierTypeType_OnlyDeform, /* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsMapping | - eModifierTypeFlag_UsesPointCache /* | - eModifierTypeFlag_SupportsEditmode | - eModifierTypeFlag_EnableInEditmode */ + eModifierTypeFlag_UsesPointCache +#if 0 + | eModifierTypeFlag_SupportsEditmode | eModifierTypeFlag_EnableInEditmode +#endif , /* icon */ ICON_MOD_PARTICLES, |