Cleanup: spelling in comments, update dictionary

This commit is contained in:
Campbell Barton 2023-09-03 21:35:03 +10:00
parent 9af2291541
commit e8c812a307
59 changed files with 131 additions and 98 deletions

@ -276,7 +276,7 @@ static GHOST_TKey convertSDLKey(SDL_Scancode key)
GXMAP(type, SDL_SCANCODE_KP_MULTIPLY, GHOST_kKeyNumpadAsterisk);
GXMAP(type, SDL_SCANCODE_KP_DIVIDE, GHOST_kKeyNumpadSlash);
/* Media keys in some keyboards and laptops with XFree86/Xorg */
/* Media keys in some keyboards and laptops with XFree86/XORG. */
GXMAP(type, SDL_SCANCODE_AUDIOPLAY, GHOST_kKeyMediaPlay);
GXMAP(type, SDL_SCANCODE_AUDIOSTOP, GHOST_kKeyMediaStop);
GXMAP(type, SDL_SCANCODE_AUDIOPREV, GHOST_kKeyMediaFirst);

@ -1882,7 +1882,7 @@ static GHOST_TKey ghost_key_from_keysym(const KeySym key)
GXMAP(type, XK_KP_Multiply, GHOST_kKeyNumpadAsterisk);
GXMAP(type, XK_KP_Divide, GHOST_kKeyNumpadSlash);
/* Media keys in some keyboards and laptops with XFree86/Xorg */
/* Media keys in some keyboards and laptops with XFree86/XORG. */
#ifdef WITH_XF86KEYSYM
GXMAP(type, XF86XK_AudioPlay, GHOST_kKeyMediaPlay);
GXMAP(type, XF86XK_AudioStop, GHOST_kKeyMediaStop);

@ -19,7 +19,7 @@
#ifdef WITH_X11_XINPUT
# include <X11/extensions/XInput.h>
/* Disable XINPUT warp, currently not implemented by Xorg for multi-head display.
/* Disable XINPUT warp, currently not implemented by XORG for multi-head display.
* (see comment in XSERVER `Xi/xiwarppointer.c` -> `FIXME: panoramix stuff is missing` ~ v1.13.4)
* If this is supported we can add back XINPUT for warping (fixing #48901).
* For now disable (see #50383). */

@ -111,7 +111,7 @@ float dither_random_value(vec2 co)
/* Convert uniform distribution into triangle-shaped distribution. */
float orig = nrnd0 * 2.0 - 1.0;
nrnd0 = orig * inversesqrt(abs(orig));
nrnd0 = max(-1.0, nrnd0); /* Removes nan's */
nrnd0 = max(-1.0, nrnd0); /* Removes NAN's. */
return nrnd0 - sign(orig);
}
@ -133,7 +133,7 @@ vec4 apply_dither(vec4 col, vec2 uv)
/** \name Main Processing
* \{ */
/* Prototypes: Implementation is generaterd and defined after. */
/* Prototypes: Implementation is generated and defined after. */
#ifndef GPU_METAL /* Forward declaration invalid in MSL. */
vec4 OCIO_to_scene_linear(vec4 pixel);
vec4 OCIO_to_display(vec4 pixel);
@ -151,7 +151,7 @@ vec4 OCIO_ProcessColor(vec4 col, vec4 col_overlay)
}
}
/* NOTE: This is true we only do de-premul here and NO premul
/* NOTE: This is true we only do de-pre-multiply here and NO pre-multiply
* and the reason is simple -- opengl is always configured
* for straight alpha at this moment
*/

@ -113,7 +113,7 @@ def get_object_name(stroke):
def material_from_fedge(fe):
"get the diffuse rgba color from an FEdge"
"get the diffuse RGBA color from an FEdge"
if fe is None:
return None
if fe.is_smooth:

@ -836,7 +836,7 @@ class PerlinNoise2DShader(StrokeShader):
that in a scene no strokes will be distorted identically.
More information on the noise shaders can be found at:
freestyleintegration.wordpress.com/2011/09/25/development-updates-on-september-25/
https://freestyleintegration.wordpress.com/2011/09/25/development-updates-on-september-25/
"""
def __init__(self, freq=10, amp=10, oct=4, angle=radians(45), seed=-1):

@ -43,7 +43,7 @@ def reduce_newlines(text):
def reduce_spaces(text):
"""Reduces multiple whitespaces to a single space.
"""Reduces multiple white-spaces to a single space.
:arg text: text with multiple spaces
:type text: str
@ -100,7 +100,7 @@ def get_argspec(func, *, strip_self=True, doc=None, source=None):
func_name = func.__name__
except AttributeError:
return ''
# from docstring
# From doc-string.
if doc is None:
doc = get_doc(func)
match = re.search(DEF_DOC % func_name, doc, RE_FLAG)

@ -4,7 +4,7 @@
# Copyright (c) 2009 Fernando Perez, www.stani.be
# Original copyright (see docstring):
# Original copyright (see doc-string):
# ****************************************************************************
# Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
#
@ -175,6 +175,6 @@ def complete(line):
return filter_prefix(try_import(mod), words[-1])
# get here if the import is not found
# import invalidmodule
# ^, in this case return nothing
# import invalid_module
# ^, in this case return nothing
return []

@ -81,7 +81,7 @@ def complete(line, cursor, namespace, private):
def expand(line, cursor, namespace, *, private=True):
"""This method is invoked when the user asks autocompletion,
"""This method is invoked when the user asks auto-completion,
e.g. when Ctrl+Space is clicked.
:arg line: incomplete text line

@ -108,10 +108,10 @@ IMPORT_LANGUAGES_RTL = {
'ar_EG', 'fa_IR', 'he_IL',
}
# The comment prefix used in generated messages.txt file.
# The comment prefix used in generated `messages.txt` file.
MSG_COMMENT_PREFIX = "#~ "
# The comment prefix used in generated messages.txt file.
# The comment prefix used in generated `messages.txt` file.
MSG_CONTEXT_PREFIX = "MSGCTXT:"
# The default comment prefix used in po's.
@ -514,12 +514,12 @@ if not os.path.exists(BLENDER_EXEC):
# The gettext msgfmt "compiler". Youll likely have to edit it in your user_settings.py if youre under Windows.
GETTEXT_MSGFMT_EXECUTABLE = "msgfmt"
# The FriBidi C compiled library (.so under Linux, .dll under windows...).
# Youll likely have to edit it in your user_settings.py if youre under Windows., e.g. using the included one:
# FRIBIDI_LIB = os.path.join(TOOLS_DIR, "libfribidi.dll")
# The FriBidi C compiled library (.so under Linux, `.dll` under windows...).
# Youll likely have to edit it in your `user_settings.py` if youre under Windows., e.g. using the included one:
# `FRIBIDI_LIB = os.path.join(TOOLS_DIR, "libfribidi.dll")`
FRIBIDI_LIB = "libfribidi.so.0"
# The name of the (currently empty) file that must be present in a po's directory to enable rtl-preprocess.
# The name of the (currently empty) file that must be present in a po's directory to enable RTL-preprocess.
RTL_PREPROCESS_FILE = "is_rtl"
# The Blender source root path.
@ -565,7 +565,7 @@ ASSET_CATALOG_FILE = "blender_assets.cats.txt"
# The template messages file (relative to I18N_DIR).
REL_FILE_NAME_POT = os.path.join(REL_BRANCHES_DIR, DOMAIN + ".pot")
# Mo root datapath.
# Mo root data-path.
REL_MO_PATH_ROOT = os.path.join(REL_TRUNK_DIR, "locale")
# Mo path generator for a given language.

@ -41,7 +41,7 @@ def gen_menu_file(stats, settings):
highest_uid = 0
for lvl, uid_num, label, uid, flag in stats:
if lvl < limits[idx][0]:
# Sub-sort languages by iso-codes.
# Sub-sort languages by ISO-codes.
langs_cats[idx].sort(key=lambda it: it[2])
idx += 1
if lvl < settings.IMPORT_MIN_LEVEL and flag == OK:
@ -49,7 +49,7 @@ def gen_menu_file(stats, settings):
langs_cats[idx].append((uid_num, label, uid, flag))
if abs(uid_num) > highest_uid:
highest_uid = abs(uid_num)
# Sub-sort last group of languages by iso-codes!
# Sub-sort last group of languages by ISO-codes!
langs_cats[idx].sort(key=lambda it: it[2])
data_lines = [
"# File used by Blender to know which languages (translations) are available, ",

@ -756,7 +756,7 @@ class SpellChecker:
"hc",
"hdc",
"hdr", "hdri", "hdris",
"hh", "mm", "ss", "ff", # hh:mm:ss:ff timecode
"hh", "mm", "ss", "ff", # `hh:mm:ss:ff` time-code.
"hpg", # Intel Xe-HPG architecture
"hsv", "hsva", "hsl",
"id",

@ -287,7 +287,7 @@ def bake_action_iter(
while pbone.constraints:
pbone.constraints.remove(pbone.constraints[0])
# Create compatible eulers, quats.
# Create compatible euler & quaternion rotation values.
euler_prev = None
quat_prev = None

@ -233,19 +233,19 @@ def edge_loops_from_edges(mesh, edges=None):
def ngon_tessellate(from_data, indices, fix_loops=True, debug_print=True):
"""
Takes a polyline of indices (ngon) and returns a list of face
Takes a poly-line of indices (ngon) and returns a list of face
index lists. Designed to be used for importers that need indices for an
ngon to create from existing verts.
:arg from_data: either a mesh, or a list/tuple of vectors.
:type from_data: list or :class:`bpy.types.Mesh`
:arg indices: a list of indices to use this list
is the ordered closed polyline
is the ordered closed poly-line
to fill, and can be a subset of the data given.
:type indices: list
:arg fix_loops: If this is enabled polylines
:arg fix_loops: If this is enabled poly-lines
that use loops to make multiple
polylines are delt with correctly.
poly-lines are dealt with correctly.
:type fix_loops: bool
"""

@ -159,7 +159,7 @@ def location_3d_to_region_2d(region, rv3d, coord, *, default=None):
:type region: :class:`bpy.types.Region`
:arg rv3d: 3D region data, typically bpy.context.space_data.region_3d.
:type rv3d: :class:`bpy.types.RegionView3D`
:arg coord: 3d worldspace location.
:arg coord: 3d world-space location.
:type coord: 3d vector
:arg default: Return this value if ``coord``
is behind the origin of a perspective view.

@ -304,7 +304,7 @@ class Prefs(bpy.types.KeyConfigPreferences):
col.row().prop(self, "v3d_mmb_action", text="Middle Mouse Action", expand=True)
col.row().prop(self, "v3d_alt_mmb_drag_action", text="Alt Middle Mouse Drag Action", expand=True)
# Checkboxes sub-layout.
# Check-boxes sub-layout.
col = layout.column()
sub = col.column(align=True)
sub.prop(self, "use_v3d_tab_menu")

@ -850,7 +850,7 @@ def km_screen(params):
])
if params.apple:
# Apple undo and user prefs
# Apple undo and user-preferences.
items.extend([
("screen.userpref_show", {"type": 'COMMA', "value": 'PRESS', "oskey": True}, None),
])
@ -4041,7 +4041,7 @@ def km_grease_pencil_stroke_sculpt_mode(params):
("gpencil.active_frames_delete_all", {"type": 'DEL', "value": 'PRESS', "shift": True}, None),
# Context menu
*_template_items_context_panel("VIEW3D_PT_gpencil_sculpt_context_menu", params.context_menu_event),
# Automasking Pie menu
# Auto-masking Pie menu.
op_menu_pie("VIEW3D_MT_sculpt_gpencil_automasking_pie", {
"type": 'A', "shift": True, "alt": True, "value": 'PRESS'}),
])

@ -3442,7 +3442,7 @@ def km_image_paint(params):
# Stabilize Strokes
("wm.context_toggle", {"type": 'L', "value": 'PRESS'},
{"properties": [("data_path", 'tool_settings.image_paint.brush.use_smooth_stroke')]}),
# Contrext Menu
# Context menu.
*_template_items_context_panel("VIEW3D_PT_paint_texture_context_menu",
{"type": 'RIGHTMOUSE', "value": 'PRESS'}),
# Tools
@ -3500,7 +3500,7 @@ def km_vertex_paint(params):
# Stabilize Stroke
("wm.context_toggle", {"type": 'L', "value": 'PRESS'},
{"properties": [("data_path", 'tool_settings.vertex_paint.brush.use_smooth_stroke')]}),
# Contrext Menu
# Context menu.
*_template_items_context_panel("VIEW3D_PT_paint_vertex_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}),
# Tools
op_tool_cycle("builtin.select_box", {"type": 'Q', "value": 'PRESS'}),
@ -3546,7 +3546,7 @@ def km_weight_paint(params):
# Stabilize Stroke
("wm.context_toggle", {"type": 'L', "value": 'PRESS'},
{"properties": [("data_path", 'tool_settings.weight_paint.brush.use_smooth_stroke')]}),
# Contrext Menu
# Context menu.
*_template_items_context_panel("VIEW3D_PT_paint_weight_context_menu", {"type": 'RIGHTMOUSE', "value": 'PRESS'}),
# For combined weight paint + pose mode.
("view3d.select", {"type": 'LEFTMOUSE', "value": 'PRESS', "shift": True, "alt": True}, None),
@ -3817,7 +3817,7 @@ def km_armature(params):
return keymap
# Metaball edit mode.
# Meta-ball edit mode.
def km_metaball(params):
items = []
keymap = (

@ -29,7 +29,7 @@ if sys.platform == "win32":
# OIIO will by default add all paths from the path variable to add_dll_directory
# problem there is that those folders will be searched before ours and versions of
# some dlls may be found that are not blenders and may not even be the right version
# some DLL files may be found that are not blenders and may not even be the right version
# causing compatibility issues.
os.environ["OIIO_LOAD_DLLS_FROM_PATH"] = "0"

@ -677,7 +677,7 @@ class CLIP_OT_setup_tracking_scene(Operator):
self.createCollection(context, "foreground")
self.createCollection(context, "background")
# rendersettings
# Render settings.
setup_collection_recursively(
vlayers["Foreground"].layer_collection.children,
"background",

@ -69,7 +69,7 @@ class SCENE_OT_freestyle_fill_range_by_selection(Operator):
else:
self.report({'ERROR'}, "Unexpected modifier type: " + m.type)
return {'CANCELLED'}
# Find selected vertices in editmesh
# Find selected vertices in edit-mesh.
ob = context.active_object
if ob.type == 'MESH' and ob.mode == 'EDIT' and ob.name != ref.name:
bpy.ops.object.mode_set(mode='OBJECT')

@ -313,7 +313,7 @@ class SequencerFadesAdd(Operator):
for point in (fade.start, fade.end):
keyframe_points.insert(frame=point.x, value=point.y, options={'FAST'})
fade_fcurve.update()
# The graph editor and the audio waveforms only redraw upon "moving" a keyframe
# The graph editor and the audio wave-forms only redraw upon "moving" a keyframe.
keyframe_points[-1].co = keyframe_points[-1].co

@ -145,7 +145,7 @@ class PREFERENCES_OT_copy_prev(Operator):
import shutil
shutil.copytree(self._old_path(), self._new_path(), dirs_exist_ok=True, symlinks=True)
# reload preferences and recent-files.txt
# Reload preferences and `recent-files.txt`.
bpy.ops.wm.read_userpref()
bpy.ops.wm.read_history()

@ -1183,7 +1183,7 @@ class WM_OT_path_open(Operator):
try:
subprocess.check_call(["xdg-open", filepath])
except BaseException:
# xdg-open *should* be supported by recent Gnome, KDE, Xfce
# `xdg-open` *should* be supported by recent Gnome, KDE, XFCE.
import traceback
traceback.print_exc()

@ -957,7 +957,7 @@ class ConstraintButtonsPanel:
self.draw_influence(layout, con)
# Parent class for constraint subpanels
# Parent class for constraint sub-panels.
class ConstraintButtonsSubPanel:
bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW'
@ -1443,7 +1443,7 @@ class BONE_PT_bTransformConstraint_to(BoneConstraintPanel, ConstraintButtonsSubP
self.draw_transform_to(context)
# Shrinkwrap Constraint
# Shrink-wrap Constraint.
class OBJECT_PT_bShrinkwrapConstraint(ObjectConstraintPanel, ConstraintButtonsPanel, Panel):
def draw(self, context):

@ -235,7 +235,7 @@ class SCENE_PT_keying_set_paths(SceneButtonsPanel, SceneKeyingSetsPanel, Panel):
# TODO: 1) the template_any_ID needs to be fixed for the text alignment.
# 2) use_property_decorate has to properly skip the non animatable properties.
# Properties affected with needless draw:
# group_method, template_any_ID dropdown, use_entire_array
# group_method, template_any_ID drop-down, use_entire_array.
layout.use_property_split = True
layout.use_property_decorate = False # No animation (remove this later on).

@ -49,7 +49,7 @@ class DopesheetFilterPopoverBase:
bl_region_type = 'HEADER'
bl_label = "Filters"
# Generic = Affects all datatypes
# Generic = Affects all data-types.
# XXX: Perhaps we want these to stay in the header instead, for easy/fast access
@classmethod
def draw_generic_filters(cls, context, layout):
@ -160,7 +160,7 @@ class DopesheetFilterPopoverBase:
col.prop(dopesheet, "use_datablock_sort", icon='NONE')
# Popover for Dopesheet Editor(s) - Dopesheet, Action, Shapekey, GPencil, Mask, etc.
# Popover for Dope-sheet Editor(s) - Dope-sheet, Action, Shape-key, GPencil, Mask, etc.
class DOPESHEET_PT_filters(DopesheetFilterPopoverBase, Panel):
bl_space_type = 'DOPESHEET_EDITOR'
bl_region_type = 'HEADER'

@ -249,7 +249,7 @@ class NODE_MT_add(bpy.types.Menu):
layout.separator()
# actual node submenus are defined by draw functions from node categories
# Actual node sub-menus are defined by draw functions from node categories.
nodeitems_utils.draw_node_categories_menu(self, context)

@ -7641,7 +7641,7 @@ class VIEW3D_PT_context_properties(Panel):
rna_prop_ui.draw(self.layout, context, member, object, use_edit=False)
# Grease Pencil Object - Multiframe falloff tools
# Grease Pencil Object - Multi-frame falloff tools.
class VIEW3D_PT_gpencil_multi_frame(Panel):
bl_space_type = 'VIEW_3D'
bl_region_type = 'HEADER'

@ -738,9 +738,9 @@ class VIEW3D_PT_tools_brush_stroke_smooth_stroke(Panel, View3DPaintPanel, Smooth
class VIEW3D_PT_tools_weight_gradient(Panel, View3DPaintPanel):
# dont give context on purpose to not show this in the generic header toolsettings
# Don't give context on purpose to not show this in the generic header tool-settings
# this is added only in the gradient tool's ToolDef
# bl_context = ".weightpaint" # dot on purpose (access from topbar)
# `bl_context = ".weightpaint"` # dot on purpose (access from top-bar)
bl_label = "Falloff"
bl_options = {'DEFAULT_CLOSED'}
# also dont draw as an extra panel in the sidebar (already included in the Brush settings)

@ -82,10 +82,10 @@ def node_group_items(context):
for group in context.blend_data.node_groups:
if group.bl_idname != ntree.bl_idname:
continue
# filter out recursive groups
# Filter out recursive groups.
if group.contains_tree(ntree):
continue
# filter out hidden nodetrees
# Filter out hidden node-trees.
if group.name.startswith('.'):
continue
yield NodeItem(node_tree_group_type[group.bl_idname],

@ -73,7 +73,7 @@ def main(context, event):
class ViewOperatorRayCast(bpy.types.Operator):
"""Modal object selection with a ray cast"""
bl_idname = "view3d.modal_operator_raycast"
bl_label = "RayCast View Operator"
bl_label = "Ray-cast View Operator"
def modal(self, context, event):
if event.type in {'MIDDLEMOUSE', 'WHEELUPMOUSE', 'WHEELDOWNMOUSE'}:
@ -100,7 +100,7 @@ def menu_func(self, context):
self.layout.operator(ViewOperatorRayCast.bl_idname, text="Raycast View Modal Operator")
# Register and add to the "view" menu (required to also use F3 search "Raycast View Modal Operator" for quick access).
# Register and add to the "view" menu (required to also use F3 search "Ray-cast View Modal Operator" for quick access).
def register():
bpy.utils.register_class(ViewOperatorRayCast)
bpy.types.VIEW3D_MT_view.append(menu_func)

@ -42,7 +42,7 @@ def enum_previews_from_directory_items(self, context):
print("Scanning directory: %s" % directory)
if directory and os.path.exists(directory):
# Scan the directory for png files
# Scan the directory for `*.png` files
image_paths = []
for fn in os.listdir(directory):
if fn.lower().endswith(".png"):

@ -1527,7 +1527,7 @@ static void object_get_datamask(const Depsgraph *depsgraph,
r_mask->fmask |= CD_MASK_MTFACE;
}
/* check if we need mcols due to vertex paint or weightpaint */
/* Check if we need mcols due to vertex paint or weight-paint. */
if (ob->mode & OB_MODE_VERTEX_PAINT) {
r_mask->lmask |= CD_MASK_PROP_BYTE_COLOR;
}

@ -1665,12 +1665,13 @@ static bool nla_combine_get_inverted_lower_value(const int mix_mode,
* up interpolation for the animator, requiring further cleanup on their part.
*/
if (IS_EQF(blended_value, 0.0f)) {
/* For blending, nla_combine_value(), when strip_value==0:
*
* blended_value = lower_value * powf(strip_value / base_value, infl);
* blended_value = lower_value * powf(0, infl);
* blended_value = lower_value * 0;
* blended_value = 0;
/* For blending, nla_combine_value(), when `strip_value == 0`:
* \code{.cc}
* blended_value = lower_value * powf(strip_value / base_value, infl);
* blended_value = lower_value * powf(0, infl);
* blended_value = lower_value * 0;
* blended_value = 0;
* \endcode
*
* Effectively, blended_value will equal 0 no matter what lower_value is. Put another
* way, when (blended_value==0 and strip_value==0), then lower_value can be any value and

@ -839,7 +839,7 @@ static void get_effector_tot(
if (eff->pd->forcefield == PFIELD_CHARGE) {
/* Only the charge of the effected particle is used for
* interaction, not fall-offs. If the fall-offs aren't the
* same this will be unphysical, but for animation this
* same this will be nonphysical, but for animation this
* could be the wanted behavior. If you want physical
* correctness the fall-off should be spherical 2.0 anyways.
*/

@ -2304,7 +2304,7 @@ void BKE_nla_tweakmode_exit(AnimData *adt)
BKE_nlastrip_recalculate_bounds_sync_action(strip);
}
/* clear tweakuser flag */
/* Clear tweak-user flag. */
strip->flag &= ~NLASTRIP_FLAG_TWEAKUSER;
}
}

@ -3011,7 +3011,7 @@ static int collision_response(ParticleSimulationData *sim,
interp_v3_v3v3(v0_tan, v0_tan, v1_tan, frict);
}
else {
/* just basic friction (unphysical due to the friction model used in Blender) */
/* Just basic friction (nonphysical due to the friction model used in Blender). */
interp_v3_v3v3(v0_tan, v0_tan, vc_tan, frict);
}
}

@ -93,7 +93,7 @@ vec3 F_brdf_multi_scatter(vec3 f0, vec3 f90, vec2 lut)
/* The original paper uses `FssEss * radiance + Fms*Ems * irradiance`, but
* "A Journey Through Implementing Multiscattering BRDFs and Area Lights" by Steve McAuley
* suggests to use `FssEss * radiance + Fms*Ems * radiance` which results in comparible quality.
* suggests to use `FssEss * radiance + Fms*Ems * radiance` which results in comparable quality.
* We handle `radiance` outside of this function, so the result simplifies to:
* `FssEss + Fms*Ems = FssEss * (1 + Ems*Favg / (1 - Ems*Favg)) = FssEss / (1 - Ems*Favg)`.
* This is a simple albedo scaling very similar to the approach used by Cycles:

@ -299,7 +299,7 @@ vec3 F_brdf_multi_scatter(vec3 f0, vec3 f90, vec2 lut)
/* The original paper uses `FssEss * radiance + Fms*Ems * irradiance`, but
* "A Journey Through Implementing Multiscattering BRDFs and Area Lights" by Steve McAuley
* suggests to use `FssEss * radiance + Fms*Ems * radiance` which results in comparible quality.
* suggests to use `FssEss * radiance + Fms*Ems * radiance` which results in comparable quality.
* We handle `radiance` outside of this function, so the result simplifies to:
* `FssEss + Fms*Ems = FssEss * (1 + Ems*Favg / (1 - Ems*Favg)) = FssEss / (1 - Ems*Favg)`.
* This is a simple albedo scaling very similar to the approach used by Cycles:

@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-2.0-or-later */
/**
* Virtual shadow-mapping: Defrag.
* Virtual shadow-mapping: Defragment.
*
* Defragment the cached page buffer making one continuous array.
*

@ -109,7 +109,7 @@ void main()
List unsorted_list = list_split_after(sorted_list, sorted_list.first);
/* Mutable foreach. */
/* Mutable for-each. */
for (int i = unsorted_list.first, next; i > -1; i = next) {
next = surfel_buf[i].next;

@ -17,7 +17,7 @@ vec4 texture_read_as_linearrgb(sampler2D tex, bool premultiplied, vec2 co)
/* By convention image textures return scene linear colors, but
* overlays still assume srgb. */
vec4 col = texture(tex, co);
/* Unpremultiply if stored multiplied, since straight alpha is expected by shaders. */
/* Un-pre-multiply if stored multiplied, since straight alpha is expected by shaders. */
if (premultiplied && !(col.a == 0.0 || col.a == 1.0)) {
col.rgb = col.rgb / col.a;
}

@ -29,8 +29,8 @@
* behavior. Uncomment DISABLE_DEBUG_SHADER_drw_print_BARRIER to remove the barriers if that
* happens. But then you are limited to a single invocation output.
*
* IMPORTANT: All of these are copied to the CPU debug libs (draw_debug.cc). They need to be kept
* in sync to write the same data.
* IMPORTANT: All of these are copied to the CPU debug libraries (draw_debug.cc).
* They need to be kept in sync to write the same data.
*/
#ifdef DRW_DEBUG_PRINT

@ -89,7 +89,7 @@ uniform int drw_resourceChunk;
# if defined(UNIFORM_RESOURCE_ID)
/* This is in the case we want to do a special instance drawcall for one object but still want to
* have the right resourceId and all the correct ubo datas. */
* have the right resourceId and all the correct UBO datas. */
uniform int drw_ResourceID;
# define resource_id drw_ResourceID
# else

@ -226,7 +226,7 @@ bool ED_armature_pose_select_pick_bone(const Scene *scene,
}
if (ob_act) {
/* In weightpaint we select the associated vertex group too. */
/* In weight-paint we select the associated vertex group too. */
if (ob_act->mode & OB_MODE_ALL_WEIGHT_PAINT) {
if (bone == arm->act_bone) {
ED_vgroup_select_by_name(ob_act, bone->name);
@ -602,7 +602,7 @@ static int pose_de_select_all_exec(bContext *C, wmOperator *op)
pose_do_bone_select(pchan, action);
if (ob_prev != ob) {
/* weightpaint or mask modifiers need depsgraph updates */
/* Weight-paint or mask modifiers need depsgraph updates. */
if (multipaint || (arm->flag & ARM_HAS_VIZ_DEPS)) {
DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY);
}
@ -1262,7 +1262,7 @@ static int pose_select_mirror_exec(bContext *C, wmOperator *op)
if (pchan_mirror_act) {
arm->act_bone = pchan_mirror_act->bone;
/* In weightpaint we select the associated vertex group too. */
/* In weight-paint we select the associated vertex group too. */
if (is_weight_paint) {
ED_vgroup_select_by_name(ob_active, pchan_mirror_act->name);
DEG_id_tag_update(&ob_active->id, ID_RECALC_GEOMETRY);

@ -821,7 +821,8 @@ static void createTransPose(bContext * /*C*/, TransInfo *t)
const bool mirror = ((pose->flag & POSE_MIRROR_EDIT) != 0);
const bool is_mirror_relative = ((pose->flag & POSE_MIRROR_RELATIVE) != 0);
tc->poseobj = ob; /* we also allow non-active objects to be transformed, in weightpaint */
/* We also allow non-active objects to be transformed, in weight-paint. */
tc->poseobj = ob;
/* init trans data */
td = tc->data = static_cast<TransData *>(

@ -193,7 +193,7 @@ extern std::string bc_replace_string(std::string data,
const std::string &replacement);
extern std::string bc_url_encode(std::string data);
/**
* Calculate a rescale factor such that the imported scene's scale
* Calculate a re-scale factor such that the imported scene's scale
* is preserved. I.e. 1 meter in the import will also be
* 1 meter in the current scene.
*/

@ -62,8 +62,8 @@ pxr::UsdTimeCode USDAbstractWriter::get_export_time_code() const
BLI_assert(usd_export_context_.get_time_code);
return usd_export_context_.get_time_code();
}
/* By using the default timecode USD won't even write a single `timeSample` for non-animated
* data. Instead, it writes it as non-timesampled. */
/* By using the default time-code USD won't even write a single `timeSample` for non-animated
* data. Instead, it writes it as non-time-sampled. */
static pxr::UsdTimeCode default_timecode = pxr::UsdTimeCode::Default();
return default_timecode;
}

@ -1039,7 +1039,7 @@ typedef enum IDRecalcFlag {
ID_RECALC_ANIMATION = (1 << 2),
/* ** Particle system changed. ** */
/* Only do pathcache etc. */
/* Only do path-cache etc. */
ID_RECALC_PSYS_REDO = (1 << 3),
/* Reset everything including point-cache. */
ID_RECALC_PSYS_RESET = (1 << 4),

@ -836,7 +836,7 @@ typedef struct FluidEffectorSettings {
/* -- User-accessible fields (from here on). -- */
float surface_distance; /* Thickness of mesh surface, used in obstacle sdf. */
float surface_distance; /* Thickness of mesh surface, used in obstacle SDF. */
int flags;
int subframes;
short type;

@ -54,7 +54,7 @@ typedef enum eDrawType {
/** Any mode that uses Object.sculpt. */
#define OB_MODE_ALL_SCULPT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)
/** Any mode that uses weightpaint. */
/** Any mode that uses weight-paint. */
#define OB_MODE_ALL_WEIGHT_PAINT (OB_MODE_WEIGHT_PAINT | OB_MODE_WEIGHT_GPENCIL_LEGACY)
/**

@ -137,7 +137,7 @@ typedef struct ParticleData {
/** Size and multiplier so that we can update size when ever. */
float size;
/** Density of sph particle. */
/** Density of SPH particle. */
float sphdensity;
char _pad[4];

@ -2236,7 +2236,7 @@ static int rna_Object_mesh_symmetry_yz_editable(PointerRNA *ptr, const char ** /
const Mesh *mesh = static_cast<Mesh *>(ob->data);
if (ob->mode == OB_MODE_WEIGHT_PAINT && mesh->editflag & ME_EDIT_MIRROR_VERTEX_GROUPS) {
/* Only X symmetry is available in weightpaint mode. */
/* Only X symmetry is available in weight-paint mode. */
return 0;
}

@ -16,7 +16,7 @@ from check_utils import (
ALLOWED_LIBS = (
# Core C/C++ libraries
# Core C/C++ libraries:
"ld-linux.so",
"ld-linux-x86-64.so",
"libc.so",
@ -28,12 +28,12 @@ ALLOWED_LIBS = (
"librt.so",
"libutil.so",
# Libraries which are oart of default install,
# Libraries which are part of default install:
"libcrypt.so",
"libnsl.so",
"libmvec.so.1",
# X11 libraries we don't link statically,
# X11 libraries we don't link statically:
"libX11.so",
"libXext.so",
"libXrender.so",
@ -41,15 +41,15 @@ ALLOWED_LIBS = (
"libXi.so",
"libXfixes.so",
# OpenGL libraries.
# OpenGL libraries:
"libGL.so",
"libGLU.so",
# Library the software-GL is linking against and distributes with it.
# Library the software-GL is linking against and distributes with it:
'libglapi.so',
'libxcb.so',
# Own dependencies we don't link statically.
# Own dependencies we don't link statically:
"libfreetype.so",
)

@ -6,7 +6,7 @@
dict_custom = {
# Added to newer versions of the dictionary,
# we can remove these when the updated word-lists have been applied to aspell-en.
# we can remove these when the updated word-lists have been applied to `aspell-en`.
"accessor",
"accessors",
"completer",
@ -124,6 +124,11 @@ dict_custom = {
"discretized",
"discretizes",
"downcasting",
"downsample",
"downsampled",
"downsampler",
"downsamples",
"downsampling",
"draggable",
"drawable",
"durations",
@ -210,6 +215,11 @@ dict_custom = {
"orthonormalize",
"orthonormalized",
"overridable",
"oversample",
"oversampled",
"oversampler",
"oversamples",
"oversampling",
"paddings",
"paintable",
"pannable",
@ -302,6 +312,7 @@ dict_custom = {
"reprojection",
"reprojections",
"repurpose",
"rescale",
"rescaled",
"respecialized",
"resynced",
@ -311,6 +322,7 @@ dict_custom = {
"saveable",
"schemas",
"scrollable",
"selectability",
"serializers",
"shadowless",
"sharpnesses",
@ -333,6 +345,11 @@ dict_custom = {
"subtractive",
"subtype",
"subtypes",
"supersample",
"supersampled",
"supersampler",
"supersamples",
"supersampling",
"superset",
"symmetrizable",
"symmetrize",
@ -375,6 +392,10 @@ dict_custom = {
"undeform",
"undeformed",
"undeformed",
"undersample",
"undersampled",
"undersamples",
"undersampling",
"undisplaced",
"undistored",
"undistorted",
@ -421,6 +442,7 @@ dict_custom = {
"unparsed",
"unpause",
"unpaused",
"unphysical",
"unpoision",
"unproject",
"unquantifiable",
@ -453,6 +475,11 @@ dict_custom = {
"unusably",
"unvisited",
"unwritable",
"upsample",
"upsampled",
"upsampler",
"upsamples",
"upsampling",
"userless",
"vectorial",
"vectorization",
@ -795,6 +822,10 @@ dict_ignore_hyphenated_suffix = {
files_ignore = {
"tools/utils_doc/rna_manual_reference_updater.py", # Contains language ID references.
# Maintained by 3rd party.
"source/blender/draw/intern/shaders/common_fxaa_lib.glsl",
"source/blender/gpu/shaders/common/gpu_shader_smaa_lib.glsl",
}
directories_ignore = {

@ -335,7 +335,7 @@ def main() -> None:
args = argparse_create().parse_args()
# TODO, there are for sure more companies then are currently listed.
# 1 liners for in html syntax
# 1 liners for in HTML syntax.
contrib_companies = (
"<b>Unity Technologies</b> - FBX Exporter",
"<b>BioSkill GmbH</b> - H3D compatibility for X3D Exporter, OBJ Nurbs Import/Export",

@ -10,7 +10,7 @@ import sys
# Hashes to be ignored
#
# The system sometimes fails to match commits and suggests to backport
# The system sometimes fails to match commits and suggests to back-port
# revision which was already ported. In order to solve that we can:
#
# - Explicitly ignore some of the commits.

@ -514,7 +514,7 @@ class edit_generators:
Replace:
float abc[3] = {0, 1, 2};
With:
const float abc[3] = {0, 1, 2};
`const float abc[3] = {0, 1, 2};`
Replace:
float abc[3]
@ -1932,7 +1932,7 @@ def run_edits_on_directory(
# print(c)
if index != -1:
# Remove first part of the path, we don't want to match
# against paths in Blender's repo.
# against paths in Blender's repository.
# print(source_path)
c_strip = c[index:]
for regex in regex_list: