kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: spelling in comments

Browse Source
This commit is contained in:
Campbell Barton 2022-09-16 18:13:19 +10:00
parent 48d7ff68f0
commit 95f05a6a4b
126 changed files with 214 additions and 209 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/GHOST_ISystem.h
View File

@ -281,7 +281,7 @@ class GHOST_ISystem {
const bool stereoVisual) = 0;
/**
* Updates the resolution while in fullscreen mode.
* Updates the resolution while in full-screen mode.
* \param setting: The new setting of the display.
* \param window: Window displayed in full screen.
*

6
intern/ghost/intern/GHOST_System.h
View File

@ -123,7 +123,7 @@ class GHOST_System : public GHOST_ISystem {
const bool stereoVisual);
/**
* Updates the resolution while in fullscreen mode.
* Updates the resolution while in full-screen mode.
* \param setting: The new setting of the display.
* \param window: Window displayed in full screen.
*
@ -369,7 +369,7 @@ class GHOST_System : public GHOST_ISystem {
virtual GHOST_TSuccess exit();
/**
* Creates a fullscreen window.
* Creates a full-screen window.
* \param window: The window created.
* \return Indication of success.
*/
@ -399,7 +399,7 @@ class GHOST_System : public GHOST_ISystem {
GHOST_EventPrinter *m_eventPrinter;
#endif // WITH_GHOST_DEBUG
/** Settings of the display before the display went fullscreen. */
/** Settings of the display before the display went full-screen. */
GHOST_DisplaySetting m_preFullScreenSetting;
/** Which tablet API to use. */

2
intern/ghost/intern/GHOST_SystemCocoa.h
View File

@ -79,7 +79,7 @@ class GHOST_SystemCocoa : public GHOST_System {
* \param state: The state of the window when opened.
* \param type: The type of drawing context installed in this window.
* \param glSettings: Misc OpenGL settings.
* \param exclusive: Use to show the window ontop and ignore others (used fullscreen).
* \param exclusive: Use to show the window on top and ignore others (used full-screen).
* \param parentWindow: Parent (embedder) window.
* \return The new window (or 0 if creation failed).
*/

2
intern/ghost/intern/GHOST_SystemWin32.h
View File

@ -105,7 +105,7 @@ class GHOST_SystemWin32 : public GHOST_System {
* \param state: The state of the window when opened.
* \param type: The type of drawing context installed in this window.
* \param glSettings: Misc OpenGL settings.
* \param exclusive: Use to show the window ontop and ignore others (used fullscreen).
* \param exclusive: Use to show the window on top and ignore others (used full-screen).
* \param parentWindow: Parent window.
* \return The new window (or 0 if creation failed).
*/

2
intern/ghost/intern/GHOST_SystemX11.h
View File

@ -115,7 +115,7 @@ class GHOST_SystemX11 : public GHOST_System {
* \param state: The state of the window when opened.
* \param type: The type of drawing context installed in this window.
* \param stereoVisual: Create a stereo visual for quad buffered stereo.
* \param exclusive: Use to show the window ontop and ignore others (used full*screen).
* \param exclusive: Use to show the window on top and ignore others (used full-screen).
* \param parentWindow: Parent (embedder) window.
* \return The new window (or 0 if creation failed).
*/

2
intern/ghost/intern/GHOST_Window.h
View File

@ -29,7 +29,7 @@ class GHOST_Window : public GHOST_IWindow {
* \param height: The height of the window.
* \param state: The state the window is initially opened with.
* \param wantStereoVisual: Stereo visual for quad buffered stereo.
* \param exclusive: Use to show the window ontop and ignore others (used full-screen).
* \param exclusive: Use to show the window on top and ignore others (used full-screen).
*/
GHOST_Window(uint32_t width,
uint32_t height,

2
intern/ghost/intern/GHOST_WindowCocoa.mm
View File

@ -719,7 +719,7 @@ void GHOST_WindowCocoa::setNativePixelSize(void)
}
/**
* \note Fullscreen switch is not actual fullscreen with display capture.
* \note Full-screen switch is not actual fullscreen with display capture.
* As this capture removes all OS X window manager features.
*
* Instead, the menu bar and the dock are hidden, and the window is made border-less and enlarged.

4
intern/ghost/intern/GHOST_WindowManager.h
View File

@ -113,13 +113,13 @@ class GHOST_WindowManager {
/** The list of windows managed */
std::vector<GHOST_IWindow *> m_windows;
/** Window in fullscreen state. There can be only one of this which is not in or window list. */
/** Window in full-screen state. There can be only one of this which is not in or window list. */
GHOST_IWindow *m_fullScreenWindow;
/** The active window. */
GHOST_IWindow *m_activeWindow;
/** Window that was active before entering fullscreen state. */
/** Window that was active before entering full-screen state. */
GHOST_IWindow *m_activeWindowBeforeFullScreen;
#ifdef WITH_CXX_GUARDEDALLOC

2
intern/ghost/intern/GHOST_WindowViewCocoa.h
View File

@ -226,7 +226,7 @@
[super drawRect:rect];
systemCocoa->handleWindowEvent(GHOST_kEventWindowUpdate, associatedWindow);
/* For some cases like entering fullscreen we need to redraw immediately
/* For some cases like entering full-screen we need to redraw immediately
* so our window does not show blank during the animation */
if (associatedWindow->getImmediateDraw())
systemCocoa->dispatchEvents();

2
intern/ghost/test/gears/GHOST_C-Test.c
View File

@ -315,7 +315,7 @@ bool processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData)
} break;
case GHOST_kKeyF:
if (!GHOST_GetFullScreen(shSystem)) {
/* Begin fullscreen mode */
/* Begin full-screen mode. */
setting.bpp = 24;
setting.frequency = 85;
setting.xPixels = 640;

2
source/blender/blenfont/intern/blf_thumbs.c
View File

@ -94,7 +94,7 @@ void BLF_thumb_preview(const char *filepath,
font->pos[1] -= (int)((float)blf_font_ascender(font) * 1.1f);
/* We fallback to default english strings in case not enough chars are available in current
/* We fallback to default English strings in case not enough chars are available in current
* font for given translated string (useful in non-Latin i18n context, like Chinese,
* since many fonts will then show nothing but ugly 'missing char' in their preview).
* Does not handle all cases, but much better than nothing.

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

@ -106,7 +106,7 @@ typedef enum eFMI_Action_Types {
/* Flags for the requirements of a FModifier Type */
typedef enum eFMI_Requirement_Flags {
/* modifier requires original data-points (kindof beats the purpose of a modifier stack?) */
/* modifier requires original data-points (kind of beats the purpose of a modifier stack?) */
FMI_REQUIRES_ORIGINAL_DATA = (1 << 0),
/* modifier doesn't require on any preceding data (i.e. it will generate a curve).
* Use in conjunction with FMI_TYPE_GENRATE_CURVE

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

@ -80,7 +80,7 @@ typedef struct Global {
* * -1: Disable faster motion paths computation (since 08/2018).
* * 1 - 30: EEVEE debug/stats values (01/2018).
* * 31: Enable the Select Debug Engine. Only available with #WITH_DRAW_DEBUG (08/2021).
* * 101: Enable UI debug drawing of fullscreen area's corner widget (10/2014).
* * 101: Enable UI debug drawing of full-screen area's corner widget (10/2014).
* * 102: Enable extra items in string search UI (05/2022).
* * 666: Use quicker batch delete for outliners' delete hierarchy (01/2019).
* * 777: Enable UI node panel's sockets polling (11/2011).

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

@ -328,7 +328,7 @@ typedef enum eIDPropertyUIDataType {
IDP_UI_DATA_TYPE_UNSUPPORTED = -1,
/** IDP_INT or IDP_ARRAY with subtype IDP_INT. */
IDP_UI_DATA_TYPE_INT = 0,
/** IDP_FLOAT and IDP_DOUBLE or IDP_ARRAY properties with a float or double subtypes. */
/** IDP_FLOAT and IDP_DOUBLE or IDP_ARRAY properties with a float or double sub-types. */
IDP_UI_DATA_TYPE_FLOAT = 1,
/** IDP_STRING properties. */
IDP_UI_DATA_TYPE_STRING = 2,

6
source/blender/blenkernel/BKE_idprop.hh
View File

@ -49,7 +49,7 @@ std::unique_ptr<IDProperty, IDPropertyDeleter> create(StringRefNull prop_name,
std::unique_ptr<IDProperty, IDPropertyDeleter> create(StringRefNull prop_name, ID *id);
/**
* \brief Allocate a new IDProperty of type IDP_ARRAY and subtype IDP_INT.
* \brief Allocate a new IDProperty of type IDP_ARRAY and sub-type IDP_INT.
*
* \param values: The values will be copied into the IDProperty.
*/
@ -57,14 +57,14 @@ std::unique_ptr<IDProperty, IDPropertyDeleter> create(StringRefNull prop_name,
Span<int32_t> values);
/**
* \brief Allocate a new IDProperty of type IDP_ARRAY and subtype IDP_FLOAT.
* \brief Allocate a new IDProperty of type IDP_ARRAY and sub-type IDP_FLOAT.
*
* \param values: The values will be copied into the IDProperty.
*/
std::unique_ptr<IDProperty, IDPropertyDeleter> create(StringRefNull prop_name, Span<float> values);
/**
* \brief Allocate a new IDProperty of type IDP_ARRAY and subtype IDP_DOUBLE.
* \brief Allocate a new IDProperty of type IDP_ARRAY and sub-type IDP_DOUBLE.
*
* \param values: The values will be copied into the IDProperty.
*/

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

@ -22,7 +22,7 @@ extern "C" {
#endif
/**
* Free (or release) any data used by this shapekey (does not free the key itself).
* Free (or release) any data used by this shape-key (does not free the key itself).
*/
void BKE_key_free_data(struct Key *key);
void BKE_key_free_nolib(struct Key *key);

22
source/blender/blenkernel/BKE_lib_id.h
View File

@ -117,14 +117,14 @@ void *BKE_id_new_nomain(short type, const char *name);
*/
enum {
/* *** Generic options (should be handled by all ID types copying, ID creation, etc.). *** */
/** Create datablock outside of any main database -
/** Create data-block outside of any main database -
* similar to 'localize' functions of materials etc. */
LIB_ID_CREATE_NO_MAIN = 1 << 0,
/** Do not affect user refcount of datablocks used by new one
* (which also gets zero usercount then).
/** Do not affect user refcount of data-blocks used by new one
* (which also gets zero user-count then).
* Implies LIB_ID_CREATE_NO_MAIN. */
LIB_ID_CREATE_NO_USER_REFCOUNT = 1 << 1,
/** Assume given 'newid' already points to allocated memory for whole datablock
/** Assume given 'newid' already points to allocated memory for whole data-block
* (ID + data) - USE WITH CAUTION!
* Implies LIB_ID_CREATE_NO_MAIN. */
LIB_ID_CREATE_NO_ALLOCATE = 1 << 2,
@ -239,12 +239,12 @@ enum {
/** Do not try to remove freed ID from given Main (passed Main may be NULL). */
LIB_ID_FREE_NO_MAIN = 1 << 0,
/**
* Do not affect user refcount of datablocks used by freed one.
* Do not affect user refcount of data-blocks used by freed one.
* Implies LIB_ID_FREE_NO_MAIN.
*/
LIB_ID_FREE_NO_USER_REFCOUNT = 1 << 1,
/**
* Assume freed ID datablock memory is managed elsewhere, do not free it
* Assume freed ID data-block memory is managed elsewhere, do not free it
* (still calls relevant ID type's freeing function though) - USE WITH CAUTION!
* Implies LIB_ID_FREE_NO_MAIN.
*/
@ -254,7 +254,7 @@ enum {
LIB_ID_FREE_NO_DEG_TAG = 1 << 8,
/** Do not attempt to remove freed ID from UI data/notifiers/... */
LIB_ID_FREE_NO_UI_USER = 1 << 9,
/** Do not remove freed ID's name from a potential runtime namemap. */
/** Do not remove freed ID's name from a potential runtime name-map. */
LIB_ID_FREE_NO_NAMEMAP_REMOVE = 1 << 10,
};
@ -283,7 +283,7 @@ void BKE_libblock_free_data_py(struct ID *id);
* \param idv: Pointer to ID to be freed.
* \param flag: Set of \a LIB_ID_FREE_... flags controlling/overriding usual freeing process,
* 0 to get default safe behavior.
* \param use_flag_from_idtag: Still use freeing info flags from given #ID datablock,
* \param use_flag_from_idtag: Still use freeing info flags from given #ID data-block,
* even if some overriding ones are passed in \a flag parameter.
*/
void BKE_id_free_ex(struct Main *bmain, void *idv, int flag, bool use_flag_from_idtag);
@ -300,7 +300,7 @@ void BKE_id_free(struct Main *bmain, void *idv);
/**
* Not really a freeing function by itself,
* it decrements usercount of given id, and only frees it if it reaches 0.
* it decrements user-count of given id, and only frees it if it reaches 0.
*/
void BKE_id_free_us(struct Main *bmain, void *idv) ATTR_NONNULL();
@ -316,12 +316,12 @@ void BKE_id_delete(struct Main *bmain, void *idv) ATTR_NONNULL();
*
* \warning Considered experimental for now, seems to be working OK but this is
* risky code in a complicated area.
* \return Number of deleted datablocks.
* \return Number of deleted data-blocks.
*/
size_t BKE_id_multi_tagged_delete(struct Main *bmain) ATTR_NONNULL();
/**
* Add a 'NO_MAIN' data-block to given main (also sets usercounts of its IDs if needed).
* Add a 'NO_MAIN' data-block to given main (also sets user-counts of its IDs if needed).
*/
void BKE_libblock_management_main_add(struct Main *bmain, void *idv);
/** Remove a data-block from given main (set it to 'NO_MAIN' status). */

8
source/blender/blenkernel/BKE_lib_remap.h
View File

@ -180,12 +180,12 @@ typedef enum IDRemapperApplyResult {
typedef enum IDRemapperApplyOptions {
/**
* Update the user count of the old and new ID datablock.
* Update the user count of the old and new ID data-block.
*
* For remapping the old ID users will be decremented and the new ID users will be
* incremented. When un-assigning the old ID users will be decremented.
*
* NOTE: Currently unused by main remapping code, since usercount is handled by
* NOTE: Currently unused by main remapping code, since user-count is handled by
* `foreach_libblock_remap_callback_apply` there, depending on whether the remapped pointer does
* use it or not. Need for rare cases in UI handling though (see e.g. `image_id_remap` in
* `space_image.c`).
@ -193,14 +193,14 @@ typedef enum IDRemapperApplyOptions {
ID_REMAP_APPLY_UPDATE_REFCOUNT = (1 << 0),
/**
* Make sure that the new ID datablock will have a 'real' user.
* Make sure that the new ID data-block will have a 'real' user.
*
* NOTE: See Note for #ID_REMAP_APPLY_UPDATE_REFCOUNT above.
*/
ID_REMAP_APPLY_ENSURE_REAL = (1 << 1),
/**
* Unassign in stead of remap when the new ID datablock would become id_self.
* Unassign in stead of remap when the new ID data-block would become id_self.
*
* To use this option 'BKE_id_remapper_apply_ex' must be used with a not-null id_self parameter.
*/

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

@ -113,7 +113,7 @@ typedef struct SpaceType {
/* read and write... */
/* default keymaps to add */
/** Default key-maps to add. */
int keymapflag;
} SpaceType;

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

@ -188,7 +188,7 @@ void DM_init_funcs(DerivedMesh *dm)
dm->getLoopTriArray = dm_getLoopTriArray;
/* subtypes handle getting actual data */
/* Sub-types handle getting actual data. */
dm->getNumLoopTri = dm_getNumLoopTri;
dm->getVertDataArray = DM_get_vert_data_layer;

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

@ -113,7 +113,7 @@ static void action_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src,
BLI_addtail(&action_dst->curves, fcurve_dst);
/* Fix group links (kindof bad list-in-list search, but this is the most reliable way). */
/* Fix group links (kind of bad list-in-list search, but this is the most reliable way). */
for (group_dst = action_dst->groups.first, group_src = action_src->groups.first;
group_dst && group_src;
group_dst = group_dst->next, group_src = group_src->next) {

12
source/blender/blenkernel/intern/anim_data.c
View File

@ -136,7 +136,7 @@ bool BKE_animdata_set_action(ReportList *reports, ID *id, bAction *act)
return false;
}
/* Reduce usercount for current action. */
/* Reduce user-count for current action. */
if (adt->action) {
id_us_min((ID *)adt->action);
}
@ -287,11 +287,11 @@ AnimData *BKE_animdata_copy(Main *bmain, AnimData *adt, const int flag)
/* make a copy of action - at worst, user has to delete copies... */
if (do_action) {
/* Recursive copy of 'real' IDs is a bit hairy. Even if do not want to deal with usercount
* when copying ID's data itself, we still need to do so with sub-IDs, since those will not be
* handled by later 'update usercounts of used IDs' code as used e.g. at end of
* BKE_id_copy_ex().
* So in case we do copy the ID and its sub-IDs in bmain, silence the 'no usercount' flag for
/* Recursive copy of 'real' IDs is a bit hairy. Even if do not want to deal with user-count
* when copying ID's data itself, we still need to do so with sub-IDs, since those will not be
* handled by later 'update user-counts of used IDs' code as used e.g. at end of
* #BKE_id_copy_ex().
* So in case we do copy the ID and its sub-IDs in bmain, silence the 'no user-count' flag for
* the sub-IDs copying.
* NOTE: This is a bit weak, as usually when it comes to recursive ID copy. Should work for
* now, but we may have to revisit this at some point and add a proper extra flag to deal with

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

@ -97,7 +97,7 @@ static void armature_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src
Bone *bone_src, *bone_dst;
Bone *bone_dst_act = NULL;
/* We never handle usercount here for own data. */
/* We never handle user-count here for own data. */
const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
armature_dst->bonehash = NULL;

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

@ -72,7 +72,7 @@ static void camera_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src,
Camera *cam_dst = (Camera *)id_dst;
const Camera *cam_src = (const Camera *)id_src;
/* We never handle usercount here for own data. */
/* We never handle user-count here for own data. */
const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
BLI_listbase_clear(&cam_dst->bg_images);

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

@ -5932,12 +5932,12 @@ static void constraint_copy_data_ex(bConstraint *dst,
cti->copy_data(dst, src);
}
/* Fix usercounts for all referenced data that need it. */
/* Fix user-counts for all referenced data that need it. */
if ((flag & LIB_ID_CREATE_NO_USER_REFCOUNT) == 0) {
con_invoke_id_looper(cti, dst, con_fix_copied_refs_cb, NULL);
}
/* for proxies we don't want to make extern */
/* For proxies we don't want to make external. */
if (do_extern) {
/* go over used ID-links for this constraint to ensure that they are valid for proxies */
con_invoke_id_looper(cti, dst, con_extern_cb, NULL);

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

@ -79,7 +79,7 @@ static void array_values_set(IDProperty *property,
template<
/** C-Primitive type of the array. Can be int32_t, float, double. */
typename PrimitiveType,
/** Subtype of the ID_ARRAY. Must match PrimitiveType. */
/** Sub-type of the #ID_ARRAY. Must match #PrimitiveType. */
eIDPropertyType id_property_subtype>
std::unique_ptr<IDProperty, IDPropertyDeleter> create_array(StringRefNull prop_name,
Span<PrimitiveType> values)

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

@ -2662,7 +2662,7 @@ Image *BKE_image_ensure_viewer(Main *bmain, int type, const char *name)
ima = image_alloc(bmain, name, IMA_SRC_VIEWER, type);
}
/* Happens on reload, imagewindow cannot be image user when hidden. */
/* Happens on reload, image-window cannot be image user when hidden. */
if (ima->id.us == 0) {
id_us_ensure_real(&ima->id);
}

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

@ -2142,7 +2142,7 @@ void do_versions_ipos_to_animato(Main *bmain)
if (ob->action) {
action_to_animdata(id, ob->action);
/* only decrease usercount if this Action isn't now being used by AnimData */
/* Only decrease user-count if this Action isn't now being used by AnimData. */
if (ob->action != adt->action) {
id_us_min(&ob->action->id);
ob->action = NULL;
@ -2246,7 +2246,7 @@ void do_versions_ipos_to_animato(Main *bmain)
/* Add AnimData block */
AnimData *adt = BKE_animdata_ensure_id(id);
/* Convert Shapekey data... */
/* Convert Shape-key data... */
ipo_to_animdata(bmain, id, key->ipo, NULL, NULL, NULL);
if (adt->action) {

8
source/blender/blenkernel/intern/lib_id.c
View File

@ -416,7 +416,7 @@ static int lib_id_expand_local_cb(LibraryIDLinkCallbackData *cb_data)
/* Can happen that we get un-linkable ID here, e.g. with shape-key referring to itself
* (through drivers)...
* Just skip it, shape key can only be either indirectly linked, or fully local, period.
* And let's curse one more time that stupid useless shapekey ID type! */
* And let's curse one more time that stupid useless shape-key ID type! */
if (*id_pointer && *id_pointer != id_self &&
BKE_idtype_idcode_is_linkable(GS((*id_pointer)->name))) {
id_lib_extern(*id_pointer);
@ -566,7 +566,7 @@ struct IDCopyLibManagementData {
int flag;
};
/* Increases usercount as required, and remap self ID pointers. */
/** Increases user-count as required, and remap self ID pointers. */
static int id_copy_libmanagement_cb(LibraryIDLinkCallbackData *cb_data)
{
ID **id_pointer = cb_data->id_pointer;
@ -1289,7 +1289,7 @@ void BKE_libblock_copy_ex(Main *bmain, const ID *id, ID **r_newid, const int ori
new_id->flag = (new_id->flag & ~copy_idflag_mask) | (id->flag & copy_idflag_mask);
/* We do not want any handling of usercount in code duplicating the data here, we do that all
/* We do not want any handling of user-count in code duplicating the data here, we do that all
* at once in id_copy_libmanagement_cb() at the end. */
const int copy_data_flag = orig_flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
@ -1566,7 +1566,7 @@ void BKE_main_id_refcount_recompute(struct Main *bmain, const bool do_linked_onl
}
FOREACH_MAIN_ID_END;
/* Go over whole Main database to re-generate proper usercounts... */
/* Go over whole Main database to re-generate proper user-counts. */
FOREACH_MAIN_ID_BEGIN (bmain, id) {
BKE_library_foreach_ID_link(bmain,
id,

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

@ -280,8 +280,8 @@ static size_t id_delete(Main *bmain, const bool do_tagged_deletion)
}
/* Now we can safely mark that ID as not being in Main database anymore. */
/* NOTE: This needs to be done in a separate loop than above, otherwise some usercounts of
* deleted IDs may not be properly decreased by the remappings (since `NO_MAIN` ID usercounts
/* NOTE: This needs to be done in a separate loop than above, otherwise some user-counts of
* deleted IDs may not be properly decreased by the remappings (since `NO_MAIN` ID user-counts
* is never affected). */
for (ID *id = tagged_deleted_ids.first; id; id = id->next) {
id->tag |= LIB_TAG_NO_MAIN;

6
source/blender/blenkernel/intern/lib_override.cc
View File

@ -1846,8 +1846,8 @@ static bool lib_override_library_resync(Main *bmain,
}
}
if (reference_id == nullptr) {
/* Can happen e.g. when there is a local override of a shapekey, but the matching linked
* obdata (mesh etc.) does not have any shapekey anymore. */
/* Can happen e.g. when there is a local override of a shape-key, but the matching linked
* obdata (mesh etc.) does not have any shape-key anymore. */
continue;
}
BLI_assert(GS(reference_id->name) == GS(id->name));
@ -3951,7 +3951,7 @@ void BKE_lib_override_library_operations_store_end(
void BKE_lib_override_library_operations_store_finalize(OverrideLibraryStorage *override_storage)
{
/* We cannot just call BKE_main_free(override_storage), not until we have option to make
* 'ghost' copies of IDs without increasing usercount of used data-blocks. */
* 'ghost' copies of IDs without increasing user-count of used data-blocks. */
ID *id;
FOREACH_MAIN_ID_BEGIN (override_storage, id) {

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

@ -1579,7 +1579,7 @@ void BKE_mask_parent_init(MaskParent *parent)
parent->id_type = ID_MC;
}
/* *** own animation/shapekey implementation ***
/* *** own animation/shape-key implementation ***
* BKE_mask_layer_shape_XXX */
int BKE_mask_layer_shape_totvert(MaskLayer *masklay)

5
source/blender/blenkernel/intern/nla.c
View File

@ -2072,7 +2072,7 @@ bool BKE_nla_tweakmode_enter(AnimData *adt)
/* handle AnimData level changes:
* - 'real' active action to temp storage (no need to change user-counts).
* - Action of active strip set to be the 'active action', and have its usercount incremented.
* - Action of active strip set to be the 'active action', and have its user-count incremented.
* - Editing-flag for this AnimData block should also get turned on
* (for more efficient restoring).
* - Take note of the active strip for mapping-correction of keyframes
@ -2136,7 +2136,8 @@ void BKE_nla_tweakmode_exit(AnimData *adt)
}
/* handle AnimData level changes:
* - 'temporary' active action needs its usercount decreased, since we're removing this reference
* - 'temporary' active action needs its user-count decreased,
* since we're removing this reference
* - 'real' active action is restored from storage
* - storage pointer gets cleared (to avoid having bad notes hanging around)
* - editing-flag for this AnimData block should also get turned off

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

@ -132,7 +132,7 @@ static void ntree_copy_data(Main *UNUSED(bmain), ID *id_dst, const ID *id_src, c
bNodeTree *ntree_dst = (bNodeTree *)id_dst;
const bNodeTree *ntree_src = (const bNodeTree *)id_src;
/* We never handle usercount here for own data. */
/* We never handle user-count here for own data. */
const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
ntree_dst->runtime = MEM_new<bNodeTreeRuntime>(__func__);

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

@ -188,7 +188,7 @@ static void object_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const in
/* Do not copy runtime data. */
BKE_object_runtime_reset_on_copy(ob_dst, flag);
/* We never handle usercount here for own data. */
/* We never handle user-count here for own data. */
const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
if (ob_src->totcol) {

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

@ -1545,7 +1545,7 @@ void BKE_rigidbody_remove_object(Main *bmain, Scene *scene, Object *ob, const bo
FOREACH_COLLECTION_OBJECT_RECURSIVE_END;
}
/* Relying on usercount of the object should be OK, and it is much cheaper than looping in all
/* Relying on user-count of the object should be OK, and it is much cheaper than looping in all
* collections to check whether the object is already in another one... */
if (ID_REAL_USERS(&ob->id) == 1) {
/* Some users seems to find it funny to use a view-layer instancing collection

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

@ -235,7 +235,7 @@ static void scene_copy_data(Main *bmain, ID *id_dst, const ID *id_src, const int
{
Scene *scene_dst = (Scene *)id_dst;
const Scene *scene_src = (const Scene *)id_src;
/* We never handle usercount here for own data. */
/* We never handle user-count here for own data. */
const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
/* We always need allocation of our private ID data. */
const int flag_private_id_data = flag & ~LIB_ID_CREATE_NO_ALLOCATE;

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

@ -305,7 +305,7 @@ IDTypeInfo IDType_ID_SCR = {
.lib_override_apply_post = NULL,
};
/* ************ Spacetype/regiontype handling ************** */
/* ************ Space-type/region-type handling ************** */
/* keep global; this has to be accessible outside of windowmanager */
static ListBase spacetypes = {NULL, NULL};

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

@ -81,7 +81,7 @@ static void vfont_copy_data(Main *UNUSED(bmain),
{
VFont *vfont_dst = (VFont *)id_dst;
/* We never handle usercount here for own data. */
/* We never handle user-count here for own data. */
const int flag_subdata = flag | LIB_ID_CREATE_NO_USER_REFCOUNT;
/* Just to be sure, should not have any value actually after reading time. */

4
source/blender/blenlib/BLI_path_util.h
View File

@ -365,8 +365,8 @@ void BLI_path_normalize_unc(char *path_16, int maxlen);
/**
* Appends a suffix to the string, fitting it before the extension
*
* string = Foo.png, suffix = 123, separator = _
* Foo.png -> Foo_123.png
* string = `Foo.png`, suffix = `123`, separator = `_`.
* `Foo.png` -> `Foo_123.png`.
*
* \param string: original (and final) string
* \param maxlen: Maximum length of string

4
source/blender/blenloader/intern/readfile.cc
View File

@ -2441,7 +2441,7 @@ static int lib_link_main_data_restore_cb(LibraryIDLinkCallbackData *cb_data)
struct IDNameLib_Map *id_map = static_cast<IDNameLib_Map *>(cb_data->user_data);
/* NOTE: Handling of usercount here is really bad, defining its own system...
/* NOTE: Handling of user-count here is really bad, defining its own system...
* Will have to be refactored at some point, but that is not top priority task for now.
* And all user-counts are properly recomputed at the end of the undo management code anyway. */
*id_pointer = static_cast<ID *>(restore_pointer_by_name(
@ -4777,7 +4777,7 @@ static void read_library_linked_ids(FileData *basefd,
}
/* `realid` shall never be nullptr - unless some source file/lib is broken
* (known case: some directly linked shapekey from a missing lib...). */
* (known case: some directly linked shape-key from a missing lib...). */
// BLI_assert(*realid != nullptr);
/* Now that we have a real ID, replace all pointers to placeholders in

4
source/blender/blenloader/intern/writefile.cc
View File

@ -1161,7 +1161,7 @@ static bool write_file_handle(Main *mainvar,
/* We only write unused IDs in undo case.
* NOTE: All Scenes, WindowManagers and WorkSpaces should always be written to disk, so
* their usercount should never be nullptr currently. */
* their user-count should never be nullptr currently. */
if (id->us == 0 && !wd->use_memfile) {
BLI_assert(!ELEM(GS(id->name), ID_SCE, ID_WM, ID_WS));
continue;
@ -1176,7 +1176,7 @@ static bool write_file_handle(Main *mainvar,
if (wd->use_memfile) {
/* Record the changes that happened up to this undo push in
* recalc_up_to_undo_push, and clear recalc_after_undo_push again
* recalc_up_to_undo_push, and clear `recalc_after_undo_push` again
* to start accumulating for the next undo push. */
id->recalc_up_to_undo_push = id->recalc_after_undo_push;
id->recalc_after_undo_push = 0;

2
source/blender/blentranslation/BLT_translation.h
View File

@ -74,7 +74,7 @@ const char *BLT_translate_do_new_dataname(const char *msgctxt, const char *msgid
#define BLT_I18NCONTEXT_UI_EVENTS "UI_Events_KeyMaps"
/* Mark the msgid applies to several elements
* (needed in some cases, as english adjectives have no plural mark :( ). */
* (needed in some cases, as English adjectives have no plural mark :( ). */
#define BLT_I18NCONTEXT_PLURAL "Plural"
/* ID-types contexts. */

2
source/blender/bmesh/bmesh.h
View File

@ -148,7 +148,7 @@
*
* These conventions should be used throughout the bmesh module.
*
* - `bmesh_kernel_*()` - Low level API, for primitive functions that others are built ontop of.
* - `bmesh_kernel_*()` - Low level API, for primitive functions that others are built on top of.
* - `bmesh_***()` - Low level API function.
* - `bm_***()` - 'static' functions, not a part of the API at all,
* but use prefix since they operate on BMesh data.

2
source/blender/bmesh/intern/bmesh_core.c
View File

@ -95,7 +95,7 @@ BMVert *BM_vert_create(BMesh *bm,
/* handles 'v->no' too */
BM_elem_attrs_copy(bm, bm, v_example, v);
/* exception: don't copy the original shapekey index */
/* Exception: don't copy the original shape-key index. */
keyi = CustomData_bmesh_get(&bm->vdata, v->head.data, CD_SHAPE_KEYINDEX);
if (keyi) {
*keyi = ORIGINDEX_NONE;

2
source/blender/bmesh/operators/bmo_subdivide.c
View File

@ -966,7 +966,7 @@ void bmo_subdivide_edges_exec(BMesh *bm, BMOperator *op)
patterns[5] = NULL;
}
/* add a temporary shapekey layer to store displacements on current geometry */
/* Add a temporary shape-key layer to store displacements on current geometry. */
BM_data_layer_add(bm, &bm->vdata, CD_SHAPEKEY);
bmo_subd_init_shape_info(bm, &params);

4
source/blender/compositor/operations/COM_TonemapOperation.h
View File

@ -21,7 +21,7 @@ typedef struct AvgLogLum {
} AvgLogLum;
/**
* \brief base class of tonemap, implementing the simple tonemap
* \brief base class of tone-map, implementing the simple tone-map
* \ingroup operation
*/
class TonemapOperation : public MultiThreadedOperation {
@ -32,7 +32,7 @@ class TonemapOperation : public MultiThreadedOperation {
SocketReader *image_reader_;
/**
* \brief settings of the Tonemap
* \brief settings of the Tone-map
*/
const NodeTonemap *data_;

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

@ -815,7 +815,7 @@ typedef struct EEVEE_EffectsInfo {
struct GPUTexture *dof_reduce_input_color_tx;
/* Other */
float prev_persmat[4][4];
/* Size used by all fullscreen buffers using mipmaps. */
/* Size used by all full-screen buffers using mipmaps. */
int hiz_size[2];
/* Lookdev */
int sphere_size;

2
source/blender/draw/engines/eevee_next/eevee_film.cc
View File

@ -5,7 +5,7 @@
/** \file
* \ingroup eevee
*
* A film is a fullscreen buffer (usually at output extent)
* A film is a full-screen buffer (usually at output extent)
* that will be able to accumulate sample in any distorted camera_type
* using a pixel filter.
*

2
source/blender/draw/engines/eevee_next/eevee_renderbuffers.cc
View File

@ -5,7 +5,7 @@
/** \file
* \ingroup eevee
*
* A film is a fullscreen buffer (usually at output extent)
* A film is a full-screen buffer (usually at output extent)
* that will be able to accumulate sample in any distorted camera_type
* using a pixel filter.
*

2
source/blender/draw/engines/gpencil/shaders/infos/gpencil_info.hh
View File

@ -47,7 +47,7 @@ GPU_SHADER_CREATE_INFO(gpencil_geometry)
/** \} */
/* -------------------------------------------------------------------- */
/** \name Fullscreen shaders
/** \name Full-Screen Shaders
* \{ */
GPU_SHADER_CREATE_INFO(gpencil_layer_blend)

4
source/blender/editors/animation/anim_channels_defines.c
View File

@ -5353,8 +5353,8 @@ void ANIM_channel_draw_widgets(const bContext *C,
* and wouldn't be able to auto-keyframe.
* - Slider should start before the toggles (if they're visible)
* to keep a clean line down the side.
* - Sliders are always drawn in Shapekey mode now. Prior to this
* the SACTION_SLIDERS flag would be set when changing into Shapekey mode.
* - Sliders are always drawn in Shape-key mode now. Prior to this
* the SACTION_SLIDERS flag would be set when changing into shape-key mode.
*/
if (((draw_sliders) && ELEM(ale->type,
ANIMTYPE_FCURVE,

2
source/blender/editors/animation/keyingsets.c
View File

@ -589,7 +589,7 @@ void ANIM_keyingset_info_unregister(Main *bmain, KeyingSetInfo *ksi)
/* find relevant builtin KeyingSets which use this, and remove them */
/* TODO: this isn't done now, since unregister is really only used at the moment when we
* reload the scripts, which kindof defeats the purpose of "builtin"? */
* reload the scripts, which kind of defeats the purpose of "builtin"? */
for (ks = builtin_keyingsets.first; ks; ks = ksn) {
ksn = ks->next;

2
source/blender/editors/armature/pose_transform.c
View File

@ -1116,7 +1116,7 @@ static void pchan_clear_rot(bPoseChannel *pchan)
}
/* Clear also Bendy Bone stuff - Roll is obvious,
* but Curve X/Y stuff is also kindof rotational in nature... */
* but Curve X/Y stuff is also kind of rotational in nature... */
pchan->roll1 = 0.0f;
pchan->roll2 = 0.0f;

10
source/blender/editors/curve/editcurve.c
View File

@ -1254,7 +1254,7 @@ void ED_curve_editnurb_load(Main *bmain, Object *obedit)
}
/* We have to pass also new copied nurbs, since we want to restore original curve
* (without edited shapekey) on obdata, but *not* on editcurve itself
* (without edited shape-key) on obdata, but *not* on editcurve itself
* (ED_curve_editnurb_load call does not always implies freeing
* of editcurve, e.g. when called to generate render data). */
calc_shapeKeys(obedit, &newnurb);
@ -1298,15 +1298,15 @@ void ED_curve_editnurb_make(Object *obedit)
BLI_addtail(&editnurb->nurbs, newnu);
}
/* animation could be added in editmode even if there was no animdata in
* object mode hence we always need CVs index be created */
/* Animation could be added in edit-mode even if there was no animdata in
* object mode hence we always need CVs index be created. */
init_editNurb_keyIndex(editnurb, &cu->nurb);
if (actkey) {
editnurb->shapenr = obedit->shapenr;
/* Apply shapekey to new nurbs of editnurb, not those of original curve
/* Apply shape-key to new nurbs of editnurb, not those of original curve
* (and *after* we generated keyIndex), else we do not have valid 'original' data
* to properly restore curve when leaving editmode. */
* to properly restore curve when leaving edit-mode. */
BKE_keyblock_convert_to_curve(actkey, cu, &editnurb->nurbs);
}
}

2
source/blender/editors/curve/editcurve_pen.c
View File

@ -1532,7 +1532,7 @@ wmKeyMap *curve_pen_modal_keymap(wmKeyConfig *keyconf)
wmKeyMap *keymap = WM_modalkeymap_find(keyconf, "Curve Pen Modal Map");
/* This function is called for each spacetype, only needs to add map once */
/* This function is called for each space-type, only needs to add map once. */
if (keymap && keymap->modal_items) {
return NULL;
}

4
source/blender/editors/gpencil/annotate_paint.c
View File

@ -2346,7 +2346,7 @@ static int annotation_draw_invoke(bContext *C, wmOperator *op, const wmEvent *ev
return OPERATOR_RUNNING_MODAL;
}
/* gpencil modal operator stores area, which can be removed while using it (like fullscreen) */
/* gpencil modal operator stores area, which can be removed while using it (like full-screen). */
static bool annotation_area_exists(bContext *C, ScrArea *area_test)
{
bScreen *screen = CTX_wm_screen(C);
@ -2698,7 +2698,7 @@ static int annotation_draw_modal(bContext *C, wmOperator *op, const wmEvent *eve
}
}
/* gpencil modal operator stores area, which can be removed while using it (like fullscreen) */
/* gpencil modal operator stores area, which can be removed while using it (like full-screen). */
if (0 == annotation_area_exists(C, p->area)) {
estate = OPERATOR_CANCELLED;
}

4
source/blender/editors/gpencil/gpencil_paint.c
View File

@ -3331,7 +3331,7 @@ static int gpencil_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event
return OPERATOR_RUNNING_MODAL;
}
/* gpencil modal operator stores area, which can be removed while using it (like fullscreen) */
/* gpencil modal operator stores area, which can be removed while using it (like full-screen). */
static bool gpencil_area_exists(bContext *C, ScrArea *area_test)
{
bScreen *screen = CTX_wm_screen(C);
@ -3888,7 +3888,7 @@ static int gpencil_draw_modal(bContext *C, wmOperator *op, const wmEvent *event)
}
}
/* gpencil modal operator stores area, which can be removed while using it (like fullscreen) */
/* gpencil modal operator stores area, which can be removed while using it (like full-screen). */
if (0 == gpencil_area_exists(C, p->area)) {
estate = OPERATOR_CANCELLED;
}

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

@ -101,16 +101,16 @@ typedef struct bAnimContext {
/* Main Data container types */
typedef enum eAnimCont_Types {
ANIMCONT_NONE = 0, /* invalid or no data */
ANIMCONT_ACTION = 1, /* action (bAction) */
ANIMCONT_SHAPEKEY = 2, /* shapekey (Key) */
ANIMCONT_ACTION = 1, /* action (#bAction) */
ANIMCONT_SHAPEKEY = 2, /* shape-key (#Key) */
ANIMCONT_GPENCIL = 3, /* grease pencil (screen) */
ANIMCONT_DOPESHEET = 4, /* dopesheet (bDopesheet) */
ANIMCONT_FCURVES = 5, /* animation F-Curves (bDopesheet) */
ANIMCONT_DRIVERS = 6, /* drivers (bDopesheet) */
ANIMCONT_NLA = 7, /* nla (bDopesheet) */
ANIMCONT_CHANNEL = 8, /* animation channel (bAnimListElem) */
ANIMCONT_MASK = 9, /* mask dopesheet */
ANIMCONT_TIMELINE = 10, /* "timeline" editor (bDopeSheet) */
ANIMCONT_DOPESHEET = 4, /* dope-sheet (#bDopesheet) */
ANIMCONT_FCURVES = 5, /* animation F-Curves (#bDopesheet) */
ANIMCONT_DRIVERS = 6, /* drivers (#bDopesheet) */
ANIMCONT_NLA = 7, /* NLA (#bDopesheet) */
ANIMCONT_CHANNEL = 8, /* animation channel (#bAnimListElem) */
ANIMCONT_MASK = 9, /* mask dope-sheet */
ANIMCONT_TIMELINE = 10, /* "timeline" editor (#bDopeSheet) */
} eAnimCont_Types;
/** \} */

4
source/blender/editors/include/ED_screen.h
View File

@ -353,8 +353,8 @@ struct ScrArea *ED_screen_state_toggle(struct bContext *C,
struct ScrArea *area,
short state);
/**
* Wrapper to open a temporary space either as fullscreen space, or as separate window, as defined
* by \a display_type.
* Wrapper to open a temporary space either as full-screen space, or as separate window,
* as defined by \a display_type.
*
* \param title: Title to set for the window, if a window is spawned.
* \param x, y: Position of the window, if a window is spawned.

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

@ -112,7 +112,7 @@ enum {
*/
AZONE_REGION,
/**
* Used when in editor fullscreen draw a corner to return to normal mode.
* Used when in editor full-screen draw a corner to return to normal mode.
*/
AZONE_FULLSCREEN,
/**

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

@ -50,7 +50,7 @@ void ED_spacetype_spreadsheet(void);
/** \} */
/* -------------------------------------------------------------------- */
/** \name Spacetype Static Data
/** \name Space-type Static Data
* Calls for instancing and freeing space-type static data called in #WM_init_exit
* \{ */

2
source/blender/editors/interface/eyedroppers/interface_eyedropper.c
View File

@ -41,7 +41,7 @@ wmKeyMap *eyedropper_modal_keymap(wmKeyConfig *keyconf)
wmKeyMap *keymap = WM_modalkeymap_find(keyconf, "Eyedropper Modal Map");
/* this function is called for each spacetype, only needs to add map once */
/* This function is called for each space-type, only needs to add map once. */
if (keymap && keymap->modal_items) {
return NULL;
}

2
source/blender/editors/interface/interface_layout.c
View File

@ -694,7 +694,7 @@ static void ui_item_array(uiLayout *layout,
else {
/* Even if 'expand' is false, we expand anyway. */
/* layout for known array subtypes */
/* Layout for known array sub-types. */
char str[3] = {'\0'};
if (!icon_only && show_text) {

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

@ -45,6 +45,6 @@ void ui_region_temp_remove(bContext *C, bScreen *screen, ARegion *region)
}
ED_region_exit(C, region);
BKE_area_region_free(nullptr, region); /* nullptr: no spacetype */
BKE_area_region_free(nullptr, region); /* nullptr: no space-type. */
BLI_freelinkN(&screen->regionbase, region);
}

4
source/blender/editors/mask/mask_shapekey.c
View File

@ -136,9 +136,9 @@ static int mask_shape_key_feather_reset_exec(bContext *C, wmOperator *UNUSED(op)
MaskLayerShape *mask_layer_shape_reset;
MaskLayerShape *mask_layer_shape;
/* get the shapekey of the current state */
/* Get the shape-key of the current state. */
mask_layer_shape_reset = BKE_mask_layer_shape_alloc(mask_layer, frame);
/* initialize from mask - as if inseting a keyframe */
/* Initialize from mask - as if inserting a keyframe. */
BKE_mask_layer_shape_from_mask(mask_layer, mask_layer_shape_reset);
for (mask_layer_shape = mask_layer->splines_shapes.first; mask_layer_shape;

2
source/blender/editors/mesh/editmesh_bevel.c
View File

@ -649,7 +649,7 @@ wmKeyMap *bevel_modal_keymap(wmKeyConfig *keyconf)
wmKeyMap *keymap = WM_modalkeymap_find(keyconf, "Bevel Modal Map");
/* This function is called for each spacetype, only needs to add map once */
/* This function is called for each space-type, only needs to add map once. */
if (keymap && keymap->modal_items) {
return NULL;
}

2
source/blender/editors/mesh/editmesh_knife.c
View File

@ -4378,7 +4378,7 @@ wmKeyMap *knifetool_modal_keymap(wmKeyConfig *keyconf)
wmKeyMap *keymap = WM_modalkeymap_find(keyconf, "Knife Tool Modal Map");
/* This function is called for each spacetype, only needs to add map once. */
/* This function is called for each space-type, only needs to add map once. */
if (keymap && keymap->modal_items) {
return NULL;
}

2
source/blender/editors/object/object_data_transform.c
View File

@ -7,7 +7,7 @@
* Use to transform object origins only.
*
* This is a small API to store & apply transformations to object data,
* where a transformation matrix can be continually applied ontop of the original values
* where a transformation matrix can be continually applied on top of the original values
* so we don't lose precision over time.
*/

2
source/blender/editors/object/object_modifier.cc
View File

@ -1556,7 +1556,7 @@ void OBJECT_OT_modifier_apply(wmOperatorType *ot)
/** \} */
/* ------------------------------------------------------------------- */
/** \name Apply Modifier As Shapekey Operator
/** \name Apply Modifier As Shape-Key Operator
* \{ */
static bool modifier_apply_as_shapekey_poll(bContext *C)

2
source/blender/editors/physics/particle_edit.c
View File

@ -3988,7 +3988,7 @@ static void brush_puff(PEData *data, int point_index, float mouse_distance)
/* Translate (not rotate) the rest of the hair if its not selected. */
{
/* NOLINTNEXTLINE: readability-redundant-preprocessor */
# if 0 /* kindof works but looks worse than what's below */
# if 0 /* Kind of works but looks worse than what's below. */
/* Move the unselected point on a vector based on the
* hair direction and the offset */

4
source/blender/editors/render/render_view.cc
View File

@ -74,7 +74,7 @@ static ScrArea *find_area_showing_r_result(bContext *C, Scene *scene, wmWindow *
ScrArea *area = nullptr;
SpaceImage *sima;
/* find an imagewindow showing render result */
/* find an image-window showing render result */
for (*win = static_cast<wmWindow *>(wm->windows.first); *win; *win = (*win)->next) {
if (WM_window_get_active_scene(*win) == scene) {
const bScreen *screen = WM_window_get_active_screen(*win);
@ -102,7 +102,7 @@ static ScrArea *find_area_image_empty(bContext *C)
ScrArea *area;
SpaceImage *sima;
/* find an imagewindow showing render result */
/* find an image-window showing render result */
for (area = static_cast<ScrArea *>(screen->areabase.first); area; area = area->next) {
if (area->spacetype == SPACE_IMAGE) {
sima = static_cast<SpaceImage *>(area->spacedata.first);

8
source/blender/editors/screen/area.c
View File

@ -175,7 +175,7 @@ void ED_area_do_refresh(bContext *C, ScrArea *area)
}
/**
* \brief Corner widget use for quitting fullscreen.
* \brief Corner widget use for quitting full-screen.
*/
static void area_draw_azone_fullscreen(
short UNUSED(x1), short UNUSED(y1), short x2, short y2, float alpha)
@ -845,7 +845,7 @@ void ED_workspace_status_text(bContext *C, const char *str)
static void area_azone_init(wmWindow *win, const bScreen *screen, ScrArea *area)
{
/* reinitialize entirely, regions and fullscreen add azones too */
/* reinitialize entirely, regions and full-screen add azones too */
BLI_freelistN(&area->actionzones);
if (screen->state != SCREENNORMAL) {
@ -2578,8 +2578,8 @@ void ED_area_prevspace(bContext *C, ScrArea *area)
/* no change */
return;
}
/* If this is a stacked fullscreen, changing to previous area exits it (meaning we're still in a
* fullscreen, but not in a stacked one). */
/* If this is a stacked full-screen, changing to previous area exits it (meaning we're still in a
* full-screen, but not in a stacked one). */
area->flag &= ~AREA_FLAG_STACKED_FULLSCREEN;
ED_area_tag_redraw(area);

6
source/blender/editors/screen/screen_edit.c
View File

@ -1275,7 +1275,7 @@ void ED_screen_full_prevspace(bContext *C, ScrArea *area)
BLI_assert(area->full);
if (area->flag & AREA_FLAG_STACKED_FULLSCREEN) {
/* stacked fullscreen -> only go back to previous area and don't toggle out of fullscreen */
/* Stacked full-screen -> only go back to previous area and don't toggle out of full-screen. */
ED_area_prevspace(C, area);
}
else {
@ -1306,8 +1306,8 @@ void ED_screen_full_restore(bContext *C, ScrArea *area)
bScreen *screen = CTX_wm_screen(C);
short state = (screen ? screen->state : SCREENMAXIMIZED);
/* if fullscreen area has a temporary space (such as a file browser or fullscreen render
* overlaid on top of an existing setup) then return to the previous space */
/* If full-screen area has a temporary space (such as a file browser or full-screen render
* overlaid on top of an existing setup) then return to the previous space. */
if (sl->next) {
if (sl->link_flag & SPACE_FLAG_TYPE_TEMPORARY) {

2
source/blender/editors/screen/screen_intern.h
View File

@ -53,7 +53,7 @@ typedef enum eScreenAxis {
/* area.c */
/**
* we swap spaces for fullscreen to keep all allocated data area vertices were set
* We swap spaces for full-screen to keep all allocated data area vertices were set.
*/
void ED_area_data_copy(ScrArea *area_dst, ScrArea *area_src, bool do_free);
void ED_area_data_swap(ScrArea *area_dst, ScrArea *area_src);

2
source/blender/editors/screen/screen_ops.c
View File

@ -3267,7 +3267,7 @@ static int screen_maximize_area_exec(bContext *C, wmOperator *op)
BLI_assert(!screen->temp);
/* search current screen for 'fullscreen' areas */
/* search current screen for 'full-screen' areas */
/* prevents restoring info header, when mouse is over it */
LISTBASE_FOREACH (ScrArea *, area_iter, &screen->areabase) {
if (area_iter->full) {

2
source/blender/editors/sculpt_paint/paint_stroke.c
View File

@ -1140,7 +1140,7 @@ struct wmKeyMap *paint_stroke_modal_keymap(struct wmKeyConfig *keyconf)
struct wmKeyMap *keymap = WM_modalkeymap_find(keyconf, name);
/* this function is called for each spacetype, only needs to add map once */
/* This function is called for each space-type, only needs to add map once. */
if (!keymap) {
keymap = WM_modalkeymap_ensure(keyconf, name, modal_items);
}

2
source/blender/editors/sculpt_paint/sculpt_expand.c
View File

@ -2244,7 +2244,7 @@ void sculpt_expand_modal_keymap(wmKeyConfig *keyconf)
static const char *name = "Sculpt Expand Modal";
wmKeyMap *keymap = WM_modalkeymap_find(keyconf, name);
/* This function is called for each spacetype, only needs to add map once. */
/* This function is called for each space-type, only needs to add map once. */
if (keymap && keymap->modal_items) {
return;
}

5
source/blender/editors/space_action/action_data.c
View File

@ -169,7 +169,7 @@ static bool action_new_poll(bContext *C)
SpaceAction *saction = (SpaceAction *)CTX_wm_space_data(C);
Object *ob = CTX_data_active_object(C);
/* For now, actions are only for the active object, and on object and shapekey levels... */
/* For now, actions are only for the active object, and on object and shape-key levels... */
if (saction->mode == SACTCONT_ACTION) {
/* XXX: This assumes that actions are assigned to the active object in this mode */
if (ob) {
@ -460,7 +460,8 @@ static bool action_stash_create_poll(bContext *C)
Scene *scene = CTX_data_scene(C);
if (!(scene->flag & SCE_NLA_EDIT_ON)) {
/* For now, actions are only for the active object, and on object and shapekey levels... */
/* For now, actions are only for the active object, and on object and shape-key levels...
*/
return ELEM(saction->mode, SACTCONT_ACTION, SACTCONT_SHAPEKEY);
}
}

2
source/blender/editors/space_node/node_edit.cc
View File

@ -2532,7 +2532,7 @@ static int ntree_socket_change_type_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
/* Don't handle subtypes for now. */
/* Don't handle sub-types for now. */
nodeModifySocketType(ntree, nullptr, iosock, socket_type->idname);
/* Need the extra update here because the loop above does not check for valid links in the node

2
source/blender/editors/space_outliner/tree/tree_display_override_library_hierarchies.cc
View File

@ -324,7 +324,7 @@ static bool id_is_in_override_hierarchy(const Main &bmain,
if (ID_IS_OVERRIDE_LIBRARY_VIRTUAL(&id)) {
/* In many cases, `relationship_parent_id` is the owner, but not always (e.g. there can be
* drivers directly between an object and a shapekey). */
* drivers directly between an object and a shape-key). */
BKE_lib_override_library_get(const_cast<Main *>(&bmain),
const_cast<ID *>(&id),
const_cast<ID *>(&relationship_parent_id),

2
source/blender/editors/space_sequencer/space_sequencer.c
View File

@ -229,7 +229,7 @@ static void sequencer_free(SpaceLink *sl)
}
}
/* Spacetype init callback. */
/* Space-type init callback. */
static void sequencer_init(struct wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area))
{
}

2
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -1353,7 +1353,7 @@ static void draw_selected_name(
}
}
else if (ELEM(ob->type, OB_MESH, OB_LATTICE, OB_CURVES_LEGACY)) {
/* try to display active bone and active shapekey too (if they exist) */
/* Try to display active bone and active shape-key too (if they exist). */
if (ob->type == OB_MESH && ob->mode & OB_MODE_WEIGHT_PAINT) {
Object *armobj = BKE_object_pose_armature_get(ob);

2
source/blender/editors/space_view3d/view3d_navigate_dolly.c
View File

@ -41,7 +41,7 @@ void viewdolly_modal_keymap(wmKeyConfig *keyconf)
wmKeyMap *keymap = WM_modalkeymap_find(keyconf, "View3D Dolly Modal");
/* this function is called for each spacetype, only needs to add map once */
/* This function is called for each space-type, only needs to add map once. */
if (keymap && keymap->modal_items) {
return;
}

2
source/blender/editors/space_view3d/view3d_navigate_fly.c
View File

@ -122,7 +122,7 @@ void fly_modal_keymap(wmKeyConfig *keyconf)
wmKeyMap *keymap = WM_modalkeymap_find(keyconf, "View3D Fly Modal");
/* this function is called for each spacetype, only needs to add map once */
/* This function is called for each space-type, only needs to add map once. */
if (keymap && keymap->modal_items) {
return;
}

2
source/blender/editors/space_view3d/view3d_navigate_move.c
View File

@ -35,7 +35,7 @@ void viewmove_modal_keymap(wmKeyConfig *keyconf)
wmKeyMap *keymap = WM_modalkeymap_find(keyconf, "View3D Move Modal");
/* this function is called for each spacetype, only needs to add map once */
/* This function is called for each space-type, only needs to add map once. */
if (keymap && keymap->modal_items) {
return;
}

2
source/blender/editors/space_view3d/view3d_navigate_rotate.c
View File

@ -37,7 +37,7 @@ void viewrotate_modal_keymap(wmKeyConfig *keyconf)
wmKeyMap *keymap = WM_modalkeymap_find(keyconf, "View3D Rotate Modal");
/* this function is called for each spacetype, only needs to add map once */
/* This function is called for each space-type, only needs to add map once. */
if (keymap && keymap->modal_items) {
return;
}

2
source/blender/editors/space_view3d/view3d_navigate_walk.c
View File

@ -170,7 +170,7 @@ void walk_modal_keymap(wmKeyConfig *keyconf)
wmKeyMap *keymap = WM_modalkeymap_find(keyconf, "View3D Walk Modal");
/* this function is called for each spacetype, only needs to add map once */
/* This function is called for each space-type, only needs to add map once. */
if (keymap && keymap->modal_items) {
return;
}

2
source/blender/editors/space_view3d/view3d_navigate_zoom.c
View File

@ -41,7 +41,7 @@ void viewzoom_modal_keymap(wmKeyConfig *keyconf)
wmKeyMap *keymap = WM_modalkeymap_find(keyconf, "View3D Zoom Modal");
/* this function is called for each spacetype, only needs to add map once */
/* This function is called for each space-type, only needs to add map once. */
if (keymap && keymap->modal_items) {
return;
}

2
source/blender/editors/transform/transform_convert_graph.c
View File

@ -639,7 +639,7 @@ static bool fcu_test_selected(FCurve *fcu)
return 0;
}
/* this function is called on recalcData to apply the transforms applied
/* This function is called on recalcData to apply the transforms applied
* to the transdata on to the actual keyframe data
*/
static void flushTransGraphData(TransInfo *t)

10
source/blender/functions/intern/field.cc
View File

@ -574,7 +574,7 @@ bool IndexFieldInput::is_equal_to(const fn::FieldNode &other) const
/** \} */
/* -------------------------------------------------------------------- */
/** \name Fieldnode
/** \name #FieldNode
* \{ */
/* Avoid generating the destructor in every translation unit. */
@ -583,7 +583,7 @@ FieldNode::~FieldNode() = default;
/** \} */
/* -------------------------------------------------------------------- */
/** \name Fieldoperation
/** \name #FieldOperation
* \{ */
FieldOperation::FieldOperation(std::shared_ptr<const MultiFunction> function,
@ -660,7 +660,7 @@ FieldOperation::FieldOperation(const MultiFunction &function, Vector<GField> inp
/** \} */
/* -------------------------------------------------------------------- */
/** \name Fieldinput
/** \name #FieldInput
* \{ */
FieldInput::FieldInput(const CPPType &type, std::string debug_name)
@ -678,7 +678,7 @@ FieldInput::~FieldInput() = default;
/** \} */
/* -------------------------------------------------------------------- */
/** \name Fieldconstant
/** \name #FieldConstant
* \{ */
FieldConstant::FieldConstant(const CPPType &type, const void *value)
@ -714,7 +714,7 @@ GPointer FieldConstant::value() const
/** \} */
/* -------------------------------------------------------------------- */
/** \name Fieldevaluator
/** \name #FieldEvaluator
* \{ */
static IndexMask index_mask_from_selection(const IndexMask full_mask,

2
source/blender/imbuf/IMB_imbuf_types.h
View File

@ -125,7 +125,7 @@ enum eImbFileType {
typedef struct ImbFormatOptions {
short flag;
/** quality serves dual purpose as quality number for jpeg or compression amount for png */
/** Quality serves dual purpose as quality number for JPEG or compression amount for PNG. */
char quality;
} ImbFormatOptions;

2
source/blender/imbuf/intern/cineon/dpxlib.c
View File

@ -4,7 +4,7 @@
/** \file
* \ingroup imbcineon
*
* Dpx image file format library routines.
* DPX image file format library routines.
*/
#include "dpxlib.h"

2
source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
View File

@ -942,7 +942,7 @@ bool DirectDrawSurface::isSupported() const
if (isTextureCube() &&
(header.caps.caps2 & DDSCAPS2_CUBEMAP_ALL_FACES) != DDSCAPS2_CUBEMAP_ALL_FACES) {
/* Cubemaps must contain all faces. */
/* Cube-maps must contain all faces. */
return false;
}

5
source/blender/imbuf/intern/openexr/openexr_api.cpp
View File

@ -708,7 +708,8 @@ struct ExrHandle {
ListBase channels; /* flattened out, ExrChannel */
ListBase layers; /* hierarchical, pointing in end to ExrChannel */
int num_half_channels; /* used during filr save, allows faster temporary buffers allocation */
/** Used during file save, allows faster temporary buffers allocation. */
int num_half_channels;
};
/* flattened out channel */
@ -1462,7 +1463,7 @@ static int imb_exr_split_channel_name(ExrChannel *echan, char *layname, char *pa
const char *end = name + strlen(name);
const char *token;
/* some multilayers have the combined buffer with names A B G R saved */
/* Some multi-layers have the combined buffer with names A B G R saved. */
if (name[1] == 0) {
echan->chan_id = BLI_toupper_ascii(name[0]);
layname[0] = '\0';

2
source/blender/imbuf/intern/scaling.c
View File

@ -828,7 +828,7 @@ static void q_scale_float(
}
/**
* q_scale_linear_interpolation (derived from ppmqscale, http://libdv.sf.net)
* q_scale_linear_interpolation (derived from `ppmqscale`, http://libdv.sf.net)
*
* q stands for quick _and_ quality :)
*

2
source/blender/makesdna/DNA_constraint_types.h
View File

@ -181,7 +181,7 @@ typedef struct bKinematicConstraint {
float orientweight;
/** CopyPose: for target-less IK. */
float grabtarget[3];
/** Subtype of IK constraint: eConstraint_IK_Type. */
/** Sub-type of IK constraint: #eConstraint_IK_Type. */
short type;
/** Distance: how to limit in relation to clamping sphere: LIMITDIST_... */
short mode;

2
source/blender/makesdna/DNA_node_types.h
View File

@ -992,7 +992,7 @@ typedef struct NodeGlare {
char _pad1[4];
} NodeGlare;
/** Tonemap node. */
/** Tone-map node. */
typedef struct NodeTonemap {
float key, offset, gamma;
float f, m, a, c;

8
source/blender/makesdna/DNA_scene_types.h
View File

@ -404,9 +404,9 @@ typedef struct ImageFormatData {
/** Generic options for all image types, alpha zbuffer. */
char flag;
/** (0 - 100), eg: jpeg quality. */
/** (0 - 100), eg: JPEG quality. */
char quality;
/** (0 - 100), eg: png compression. */
/** (0 - 100), eg: PNG compression. */
char compress;
/* --- format specific --- */
@ -1500,12 +1500,12 @@ typedef struct ToolSettings {
/* Transform */
char transform_pivot_point;
char transform_flag;
/** Snap elements (per spacetype), #eSnapMode. */
/** Snap elements (per space-type), #eSnapMode. */
char _pad1[1];
short snap_mode;
char snap_node_mode;
char snap_uv_mode;
/** Generic flags (per spacetype), #eSnapFlag. */
/** Generic flags (per space-type), #eSnapFlag. */
short snap_flag;
short snap_flag_node;
short snap_flag_seq;

2
source/blender/makesdna/DNA_screen_types.h
View File

@ -477,7 +477,7 @@ typedef struct ARegion {
short do_draw_paintcursor;
/** Private, set for indicate drawing overlapped. */
short overlap;
/** Temporary copy of flag settings for clean fullscreen. */
/** Temporary copy of flag settings for clean full-screen. */
short flagfullscreen;
/** Callbacks for this region type. */

Some files were not shown because too many files have changed in this diff Show More