diff --git a/intern/cycles/kernel/data_template.h b/intern/cycles/kernel/data_template.h index 2661d362b05..f8aa79a7efd 100644 --- a/intern/cycles/kernel/data_template.h +++ b/intern/cycles/kernel/data_template.h @@ -36,7 +36,7 @@ KERNEL_STRUCT_MEMBER(background, int, map_res_x) KERNEL_STRUCT_MEMBER(background, int, map_res_y) /* Multiple importance sampling. */ KERNEL_STRUCT_MEMBER(background, int, use_mis) -/* Lightgroup. */ +/* Light-group. */ KERNEL_STRUCT_MEMBER(background, int, lightgroup) /* Light Index. */ KERNEL_STRUCT_MEMBER(background, int, light_index) diff --git a/intern/cycles/kernel/geom/object.h b/intern/cycles/kernel/geom/object.h index f5f3c36f208..5585a690e21 100644 --- a/intern/cycles/kernel/geom/object.h +++ b/intern/cycles/kernel/geom/object.h @@ -288,7 +288,7 @@ ccl_device_inline float object_pass_id(KernelGlobals kg, int object) return kernel_data_fetch(objects, object).pass_id; } -/* Lightgroup of lamp */ +/* Light-group of lamp. */ ccl_device_inline int lamp_lightgroup(KernelGlobals kg, int lamp) { @@ -298,7 +298,7 @@ ccl_device_inline int lamp_lightgroup(KernelGlobals kg, int lamp) return kernel_data_fetch(lights, lamp).lightgroup; } -/* Lightgroup of object */ +/* Light-group of object. */ ccl_device_inline int object_lightgroup(KernelGlobals kg, int object) { diff --git a/intern/cycles/kernel/integrator/shade_surface.h b/intern/cycles/kernel/integrator/shade_surface.h index 7d23ab93e00..7da942dcbec 100644 --- a/intern/cycles/kernel/integrator/shade_surface.h +++ b/intern/cycles/kernel/integrator/shade_surface.h @@ -221,7 +221,7 @@ integrate_direct_light_shadow_init_common(KernelGlobals kg, state, path, bounce); } - /* Write Lightgroup, +1 as lightgroup is int but we need to encode into a uint8_t. */ + /* Write Light-group, +1 as light-group is int but we need to encode into a uint8_t. */ INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, lightgroup) = light_group; #ifdef __PATH_GUIDING__ diff --git a/intern/cycles/kernel/integrator/shade_volume.h b/intern/cycles/kernel/integrator/shade_volume.h index 322f7b95dd1..c9dfd3dd72e 100644 --- a/intern/cycles/kernel/integrator/shade_volume.h +++ b/intern/cycles/kernel/integrator/shade_volume.h @@ -879,7 +879,7 @@ ccl_device_forceinline void integrate_volume_direct_light( state, path, transmission_bounce); INTEGRATOR_STATE_WRITE(shadow_state, shadow_path, throughput) = throughput_phase; - /* Write Lightgroup, +1 as lightgroup is int but we need to encode into a uint8_t. */ + /* Write Light-group, +1 as light-group is int but we need to encode into a uint8_t. */ INTEGRATOR_STATE_WRITE( shadow_state, shadow_path, lightgroup) = (ls.type != LIGHT_BACKGROUND) ? ls.group + 1 : diff --git a/source/blender/blenlib/BLI_math_base.h b/source/blender/blenlib/BLI_math_base.h index 368d615e526..8039bc4b0ef 100644 --- a/source/blender/blenlib/BLI_math_base.h +++ b/source/blender/blenlib/BLI_math_base.h @@ -113,7 +113,7 @@ MINLINE float scalenorm(float a, float b, float x); */ MINLINE double scalenormd(double a, double b, double x); -/* NOTE: Compilers will upcast all types smaller than int to int when performing arithmetic +/* NOTE: Compilers will up-cast all types smaller than int to int when performing arithmetic * operation. */ MINLINE int square_s(short a); diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index aaed9da1eb6..cab023265a6 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -2675,11 +2675,11 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main) Main *newmain; /* Make sure we have full path in lib->filepath_abs */ - /* Note that since existing libs are searched by their absolute path, this has to be generated + /* NOTE: Since existing libraries are searched by their absolute path, this has to be generated * before the lookup below. Otherwise, in case the stored absolute filepath is not 'correct' (may * be empty, or have been stored in a different 'relative path context'), the comparison below * will always fail, leading to creating duplicates IDs of a same library. */ - /* TODO: May be worth checking whether conparison below could use `lib->filepath` instead? */ + /* TODO: May be worth checking whether comparison below could use `lib->filepath` instead? */ STRNCPY(lib->filepath_abs, lib->filepath); BLI_path_abs(lib->filepath_abs, fd->relabase); BLI_path_normalize(lib->filepath_abs); diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc index 8ed21c0297d..05db975df17 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc @@ -44,10 +44,10 @@ /** * The code below uses a prefix naming convention to indicate the coordinate space: - * cu: Local space of the curves object that is being edited. - * su: Local space of the surface object. - * wo: World space. - * re: 2D coordinates within the region. + * `cu`: Local space of the curves object that is being edited. + * `su`: Local space of the surface object. + * `wo`: World space. + * `re`: 2D coordinates within the region. */ namespace blender::ed::sculpt_paint { diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 5645bc29036..d0142280778 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -503,7 +503,7 @@ typedef struct Object { ObjectLineArt lineart; - /** Lightgroup membership information. */ + /** Light-group membership information. */ struct LightgroupMembership *lightgroup; /** Light linking information. */ diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h index 816797bc0f8..d83aa72e7bd 100644 --- a/source/blender/makesdna/DNA_screen_types.h +++ b/source/blender/makesdna/DNA_screen_types.h @@ -180,8 +180,8 @@ typedef struct Panel { * There are 16 defines because the expansion data is typically stored in a short. * * \note Expansion for instanced panels is stored in depth first order. For example, the value of - * UI_SUBPANEL_DATA_EXPAND_2 correspond to mean the expansion of the second subpanel or the first - * subpanel's first subpanel. + * UI_SUBPANEL_DATA_EXPAND_2 correspond to mean the expansion of the second sub-panel or the first + * sub-panel's first sub-panel. */ typedef enum uiPanelDataExpansion { UI_PANEL_DATA_EXPAND_ROOT = (1 << 0), diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 75f82b43805..dcc8cf8412f 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -164,7 +164,7 @@ typedef struct Sequence { int len; /** * Start frame of contents of strip in absolute frame coordinates. - * For metastrips start of first strip startdisp. + * For meta-strips start of first strip startdisp. */ float start; /** diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h index bd2ba1e3bf7..612547c5999 100644 --- a/source/blender/makesdna/DNA_world_types.h +++ b/source/blender/makesdna/DNA_world_types.h @@ -73,7 +73,7 @@ typedef struct World { /* nodes */ struct bNodeTree *nodetree; - /* Lightgroup membership information. */ + /** Light-group membership information. */ struct LightgroupMembership *lightgroup; /** Runtime. */ diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 7ef28c6f52f..5c6d514b33b 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -1398,7 +1398,7 @@ static bool ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr C_void_pt WM_event_add_notifier(C, NC_WINDOW | NA_EDITED, NULL); #if defined(__APPLE__) || defined(WIN32) - /* OSX and Win32 don't return to the mainloop while resize */ + /* MACOS and WIN32 don't return to the main-loop while resize. */ wm_window_timer(C); wm_event_do_handlers(C); wm_event_do_notifiers(C);