griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: typo, spaces in comments, comment blocks & use double quotes

Browse Source
This commit is contained in:
Campbell Barton
2024-08-29 17:16:44 +10:00
parent 4ed0d9f30e
commit d497452a73
6 changed files with 27 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/kernel/osl/closures_setup.h
View File

@@ -771,7 +771,7 @@ ccl_device void osl_closure_glossy_toon_setup(KernelGlobals kg,
*/
ccl_device void osl_closure_emission_setup(KernelGlobals kg,
ccl_private ShaderData *sd,
uint32_t /* path_flag */,
uint32_t /*path_flag*/,
float3 weight,
ccl_private const GenericEmissiveClosure *closure,
float3 *layer_albedo)
@@ -789,7 +789,7 @@ ccl_device void osl_closure_emission_setup(KernelGlobals kg,
*/
ccl_device void osl_closure_background_setup(KernelGlobals kg,
ccl_private ShaderData *sd,
uint32_t /* path_flag */,
uint32_t /*path_flag*/,
float3 weight,
ccl_private const GenericBackgroundClosure *closure,
float3 *layer_albedo)
@@ -804,7 +804,7 @@ ccl_device void osl_closure_background_setup(KernelGlobals kg,
*/
ccl_device void osl_closure_holdout_setup(KernelGlobals kg,
ccl_private ShaderData *sd,
uint32_t /* path_flag */,
uint32_t /*path_flag*/,
float3 weight,
ccl_private const HoldoutClosure *closure,
float3 *layer_albedo)
@@ -815,7 +815,7 @@ ccl_device void osl_closure_holdout_setup(KernelGlobals kg,
ccl_device void osl_closure_diffuse_ramp_setup(KernelGlobals kg,
ccl_private ShaderData *sd,
uint32_t /* path_flag */,
uint32_t /*path_flag*/,
float3 weight,
ccl_private const DiffuseRampClosure *closure,
float3 *layer_albedo)
@@ -843,7 +843,7 @@ ccl_device void osl_closure_diffuse_ramp_setup(KernelGlobals kg,
ccl_device void osl_closure_phong_ramp_setup(KernelGlobals kg,
ccl_private ShaderData *sd,
uint32_t /* path_flag */,
uint32_t /*path_flag*/,
float3 weight,
ccl_private const PhongRampClosure *closure,
float3 *layer_albedo)

2
intern/cycles/scene/camera.cpp
View File

@@ -484,7 +484,7 @@ void Camera::update(Scene *scene)
previous_need_motion = need_motion;
}
void Camera::device_update(Device * /* device */, DeviceScene *dscene, Scene *scene)
void Camera::device_update(Device * /*device*/, DeviceScene *dscene, Scene *scene)
{
update(scene);

16
scripts/startup/bl_ui/space_view3d.py
View File

@@ -8789,16 +8789,16 @@ class VIEW3D_PT_greasepencil_draw_context_menu(Panel):
layout.label(text="Active Layer")
row = layout.row(align=True)
row.operator_context = 'EXEC_REGION_WIN'
row.menu("GREASE_PENCIL_MT_Layers", text='', icon='GREASEPENCIL')
row.prop(layer, "name", text='')
row.menu("GREASE_PENCIL_MT_Layers", text="", icon='GREASEPENCIL')
row.prop(layer, "name", text="")
row.operator("grease_pencil.layer_remove", text="", icon='X')
layout.label(text="Active Material")
row = layout.row(align=True)
row.menu("VIEW3D_MT_greasepencil_material_active", text='', icon='MATERIAL')
row.menu("VIEW3D_MT_greasepencil_material_active", text="", icon='MATERIAL')
ob = context.active_object
if ob.active_material:
row.prop(ob.active_material, "name", text='')
row.prop(ob.active_material, "name", text="")
class VIEW3D_PT_greasepencil_sculpt_context_menu(Panel):
@@ -8815,8 +8815,8 @@ class VIEW3D_PT_greasepencil_sculpt_context_menu(Panel):
ups = tool_settings.unified_paint_settings
size_owner = ups if ups.use_unified_size else brush
strength_owner = ups if ups.use_unified_strength else brush
layout.prop(size_owner, "size", text='')
layout.prop(strength_owner, "strength", text='')
layout.prop(size_owner, "size", text="")
layout.prop(strength_owner, "strength", text="")
layer = context.object.data.layers.active
@@ -8824,8 +8824,8 @@ class VIEW3D_PT_greasepencil_sculpt_context_menu(Panel):
layout.label(text="Active Layer")
row = layout.row(align=True)
row.operator_context = 'EXEC_REGION_WIN'
row.menu("GREASE_PENCIL_MT_Layers", text='', icon='GREASEPENCIL')
row.prop(layer, "name", text='')
row.menu("GREASE_PENCIL_MT_Layers", text="", icon='GREASEPENCIL')
row.prop(layer, "name", text="")
row.operator("grease_pencil.layer_remove", text="", icon='X')

10
source/blender/blenkernel/intern/multires_reshape_util.cc
View File

@@ -111,7 +111,7 @@ static void context_init_grid_pointers(MultiresReshapeContext *reshape_context)
&base_mesh->corner_data, CD_GRID_PAINT_MASK, base_mesh->corners_num));
}
static void context_init_commoon(MultiresReshapeContext *reshape_context)
static void context_init_common(MultiresReshapeContext *reshape_context)
{
BLI_assert(reshape_context->subdiv != nullptr);
BLI_assert(reshape_context->base_mesh != nullptr);
@@ -175,7 +175,7 @@ bool multires_reshape_context_create_from_base_mesh(MultiresReshapeContext *resh
reshape_context->top.grid_size = blender::bke::subdiv::grid_size_from_level(
reshape_context->top.level);
context_init_commoon(reshape_context);
context_init_common(reshape_context);
return context_verify_or_free(reshape_context);
}
@@ -219,7 +219,7 @@ bool multires_reshape_context_create_from_object(MultiresReshapeContext *reshape
reshape_context->cd_vertex_crease = *attributes.lookup<float>("crease_vert", AttrDomain::Point);
reshape_context->cd_edge_crease = *attributes.lookup<float>("crease_edge", AttrDomain::Edge);
context_init_commoon(reshape_context);
context_init_common(reshape_context);
return context_verify_or_free(reshape_context);
}
@@ -249,7 +249,7 @@ bool multires_reshape_context_create_from_ccg(MultiresReshapeContext *reshape_co
reshape_context->top.grid_size = blender::bke::subdiv::grid_size_from_level(
reshape_context->top.level);
context_init_commoon(reshape_context);
context_init_common(reshape_context);
return context_verify_or_free(reshape_context);
}
@@ -302,7 +302,7 @@ bool multires_reshape_context_create_from_subdiv(MultiresReshapeContext *reshape
reshape_context->top.level = top_level;
reshape_context->top.grid_size = subdiv::grid_size_from_level(reshape_context->top.level);
context_init_commoon(reshape_context);
context_init_common(reshape_context);
return context_verify_or_free(reshape_context);
}

4
source/blender/draw/engines/overlay/shaders/overlay_armature_shape_wire_geom.glsl
View File

@@ -45,8 +45,8 @@ void main()
screen_space_pos[0] = pos0.xy / pos0.w;
screen_space_pos[1] = pos1.xy / pos1.w;
/* `sizeEdge` is defined as the distance from the center to the outer edge. As such to get the
total width it needs to be doubled. */
/* `sizeEdge` is defined as the distance from the center to the outer edge.
* As such to get the total width it needs to be doubled. */
const float wire_width = geometry_in[0].wire_width * (sizeEdge * 2);
geometry_out.wire_width = wire_width;
float half_size = max(wire_width / 2.0, 0.5);

9
source/blender/imbuf/IMB_imbuf.hh
View File

@@ -404,11 +404,14 @@ ImBuf *IMB_onehalf(ImBuf *ibuf1);
enum class IMBScaleFilter {
/** No filtering (point sampling). This is fastest but lowest quality. */
Nearest,
/** Bilinear filter: each pixel in result image interpolates between 2x2 pixels of source image.
/**
* Bilinear filter: each pixel in result image interpolates between 2x2 pixels of source image.
*/
Bilinear,
/** Box filter. Behaves exactly like Bilinear when scaling up, better results when scaling down
by more than 2x. */
/**
* Box filter. Behaves exactly like Bilinear when scaling up,
* better results when scaling down by more than 2x.
*/
Box,
};