Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <campbell@blender.org>2022-07-06 07:24:37 +0300
committerCampbell Barton <campbell@blender.org>2022-07-06 08:28:54 +0300
commitdb9e08a0d1843d0d9efbc941f1dc85db22954dff (patch)
tree301aea7a5834ae0991874c94d645cca7330067c6 /source
parent1f0048cc2dc37097dce99157e8b0c88311fe42bc (diff)
Cleanup: spelling in comments
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/BKE_nla.h4
-rw-r--r--source/blender/makesrna/intern/rna_nla.c18
-rw-r--r--source/blender/windowmanager/xr/intern/wm_xr_intern.h2
3 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/blenkernel/BKE_nla.h b/source/blender/blenkernel/BKE_nla.h
index 11642763074..2613f4286f0 100644
--- a/source/blender/blenkernel/BKE_nla.h
+++ b/source/blender/blenkernel/BKE_nla.h
@@ -228,7 +228,7 @@ bool BKE_nlatrack_is_nonlocal_in_liboverride(const struct ID *id, const struct N
* - the end frame of the previous strip, if the strip's track contains another strip on it left
* - the macro MINFRAMEF, if no strips are to the left of this strip in its track
*
- * \param strip The strip to compute the left-hand-side 'frame limit' of.
+ * \param strip: The strip to compute the left-hand-side 'frame limit' of.
* \return The beginning frame of the previous strip, or MINFRAMEF if no strips are next in that
* track.
*/
@@ -241,7 +241,7 @@ float BKE_nlastrip_compute_frame_from_previous_strip(struct NlaStrip *strip);
* - the begin frame of the next strip, if the strip's track contains another strip on it right
* - the macro MAXFRAMEF, if no strips are to the right of this strip in its track
*
- * \param strip The strip to compute the right-hand-side 'frame limit' of.
+ * \param strip: The strip to compute the right-hand-side 'frame limit' of.
* \return The beginning frame of the next strip, or MAXFRAMEF if no strips are next in that track.
*/
float BKE_nlastrip_compute_frame_to_next_strip(struct NlaStrip *strip);
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c
index bbe9ea13a0b..524e3134f9c 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -165,9 +165,9 @@ static void rna_NlaStrip_start_frame_set(PointerRNA *ptr, float value)
/* Simply set the frame start in a valid range : if there are any NLA strips before/after, clamp
* the start value. If the new start value is past-the-end, clamp it. Otherwise, set it.
*
- * NOTE : Unless neighbouring strips are transitions, NLASTRIP_MIN_LEN_THRESH is not needed, as
+ * NOTE: Unless neighboring strips are transitions, NLASTRIP_MIN_LEN_THRESH is not needed, as
* strips can be 'glued' to one another. If they are however, ensure transitions have a bit of
- * time alloted in order to be performed.
+ * time allotted in order to be performed.
*/
NlaStrip *data = (NlaStrip *)ptr->data;
@@ -255,11 +255,11 @@ static void rna_NlaStrip_end_frame_set(PointerRNA *ptr, float value)
data->end = value;
/* The ONLY case where we actively modify the value set by the user, is in case the start value
- * value is past the old end frame (here delta = NLASTRIP_MIN_LEN_THRESH) :
+ * value is past the old end frame (here delta = NLASTRIP_MIN_LEN_THRESH):
* - if there's no "room" for the end frame to be placed at (new_start + delta), move old_end to
- * the limit, and new_start to (limit - delta)
+ * the limit, and new_start to (limit - delta)
* - otherwise, do _not_ change the end frame. This property is not accessible from the UI, and
- * can only be set via scripts. The script should be responsable for setting the end frame.
+ * can only be set via scripts. The script should be responsible for setting the end frame.
*/
if (data->end < (data->start + NLASTRIP_MIN_LEN_THRESH)) {
/* If before-the-allowed-start : */
@@ -269,7 +269,7 @@ static void rna_NlaStrip_end_frame_set(PointerRNA *ptr, float value)
}
}
- /* Ensure transitions are kept "glued" to the strip : */
+ /* Ensure transitions are kept "glued" to the strip: */
if (data->next && data->next->type == NLASTRIP_TYPE_TRANSITION) {
data->next->start = data->end;
}
@@ -280,7 +280,7 @@ static void rna_NlaStrip_frame_end_ui_set(PointerRNA *ptr, float value)
NlaStrip *data = (NlaStrip *)ptr->data;
/* Changing the strip's end frame will update its action 'range' (defined by actstart->actend) to
- * accomodate the extra length of the strip. No other parameters of the strip will change. But
+ * accommodate the extra length of the strip. No other parameters of the strip will change. But
* this means we have to get the current strip's end frame right now :
*/
const float old_strip_end = data->end;
@@ -312,10 +312,10 @@ static void rna_NlaStrip_frame_end_ui_set(PointerRNA *ptr, float value)
/* Modify the strip's action end frame, or repeat based on :
* - if data->repeat == 1.0f, modify the action end frame :
- * - if the number of frames to substract is the number of frames, set the action end frame
+ * - if the number of frames to subtract is the number of frames, set the action end frame
* to the action start + 1 and modify the end of the strip to add that frame
* - if the number of frames
- * - otherwise, modify the repeat property to accomodate for the new length
+ * - otherwise, modify the repeat property to accommodate for the new length
*/
float action_length_delta = (old_strip_end - data->end) / data->scale;
/* If no repeats are used, then modify the action end frame : */
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_intern.h b/source/blender/windowmanager/xr/intern/wm_xr_intern.h
index bb24514457d..8ad694b6fd2 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_intern.h
+++ b/source/blender/windowmanager/xr/intern/wm_xr_intern.h
@@ -109,7 +109,7 @@ typedef struct wmXrDrawData {
GHOST_XrPose base_pose;
/** Base scale (uniform, world space). */
float base_scale;
- /** Offset to _substract_ from the OpenXR eye and viewer pose to get the wanted effective pose
+ /** Offset to _subtract_ from the OpenXR eye and viewer pose to get the wanted effective pose
* (e.g. a pose exactly at the landmark position). */
float eye_position_ofs[3]; /* Local/view space. */
} wmXrDrawData;