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/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-11-24 16:55:11 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-11-24 16:55:11 +0300
commitace5677ef0db996a4236073d1e1d6895fd5cf4bd (patch)
treed0ebc824718d8ef6f0aad260803e87228384023d /intern
parentf67a685ad9f6565a2c7054d73188bd2f3003a6df (diff)
Cleanup: spelling, repeated words
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/kernel_queues.h2
-rw-r--r--intern/cycles/render/light.h2
-rw-r--r--intern/ghost/intern/GHOST_EventButton.h2
-rw-r--r--intern/ghost/intern/GHOST_EventCursor.h4
-rw-r--r--intern/ghost/intern/GHOST_EventDragnDrop.h4
-rw-r--r--intern/libmv/libmv/autotrack/frame_accessor.h2
-rw-r--r--intern/utfconv/utfconv.h4
7 files changed, 10 insertions, 10 deletions
diff --git a/intern/cycles/kernel/kernel_queues.h b/intern/cycles/kernel/kernel_queues.h
index 91a39fc1465..451d2a0cedf 100644
--- a/intern/cycles/kernel/kernel_queues.h
+++ b/intern/cycles/kernel/kernel_queues.h
@@ -73,7 +73,7 @@ ccl_device void enqueue_ray_index_local(
int queue_number, /* Queue in which to enqueue ray index. */
char enqueue_flag, /* True for threads whose ray index has to be enqueued. */
int queuesize, /* queue size. */
- ccl_local_param unsigned int *local_queue_atomics, /* To to local queue atomics. */
+ ccl_local_param unsigned int *local_queue_atomics, /* To do local queue atomics. */
ccl_global int *Queue_data, /* Queues. */
ccl_global int *Queue_index) /* To do global queue atomics. */
{
diff --git a/intern/cycles/render/light.h b/intern/cycles/render/light.h
index 6dd23374818..4f3048c1f32 100644
--- a/intern/cycles/render/light.h
+++ b/intern/cycles/render/light.h
@@ -79,7 +79,7 @@ class Light : public Node {
void tag_update(Scene *scene);
- /* Check whether the light has contribution the the scene. */
+ /* Check whether the light has contribution the scene. */
bool has_contribution(Scene *scene);
};
diff --git a/intern/ghost/intern/GHOST_EventButton.h b/intern/ghost/intern/GHOST_EventButton.h
index e33a1c961bc..da1dc929f4f 100644
--- a/intern/ghost/intern/GHOST_EventButton.h
+++ b/intern/ghost/intern/GHOST_EventButton.h
@@ -37,7 +37,7 @@ class GHOST_EventButton : public GHOST_Event {
* \param time The time this event was generated.
* \param type The type of this event.
* \param window: The window of this event.
- * \param button: The state of the buttons were at at the time of the event.
+ * \param button: The state of the buttons were at the time of the event.
*/
GHOST_EventButton(GHOST_TUns64 time,
GHOST_TEventType type,
diff --git a/intern/ghost/intern/GHOST_EventCursor.h b/intern/ghost/intern/GHOST_EventCursor.h
index 7947b134f4b..ac40f78569d 100644
--- a/intern/ghost/intern/GHOST_EventCursor.h
+++ b/intern/ghost/intern/GHOST_EventCursor.h
@@ -36,8 +36,8 @@ class GHOST_EventCursor : public GHOST_Event {
* Constructor.
* \param msec The time this event was generated.
* \param type The type of this event.
- * \param x The x-coordinate of the location the cursor was at at the time of the event.
- * \param y The y-coordinate of the location the cursor was at at the time of the event.
+ * \param x The x-coordinate of the location the cursor was at the time of the event.
+ * \param y The y-coordinate of the location the cursor was at the time of the event.
*/
GHOST_EventCursor(GHOST_TUns64 msec,
GHOST_TEventType type,
diff --git a/intern/ghost/intern/GHOST_EventDragnDrop.h b/intern/ghost/intern/GHOST_EventDragnDrop.h
index 8e2a8d806ee..36291e8a254 100644
--- a/intern/ghost/intern/GHOST_EventDragnDrop.h
+++ b/intern/ghost/intern/GHOST_EventDragnDrop.h
@@ -69,8 +69,8 @@ class GHOST_EventDragnDrop : public GHOST_Event {
* \param type The type of this event.
* \param dataType The type of the drop candidate object
* \param window The window where the event occurred
- * \param x The x-coordinate of the location the cursor was at at the time of the event.
- * \param y The y-coordinate of the location the cursor was at at the time of the event.
+ * \param x The x-coordinate of the location the cursor was at the time of the event.
+ * \param y The y-coordinate of the location the cursor was at the time of the event.
* \param data The "content" dropped in the window
*/
GHOST_EventDragnDrop(GHOST_TUns64 time,
diff --git a/intern/libmv/libmv/autotrack/frame_accessor.h b/intern/libmv/libmv/autotrack/frame_accessor.h
index 32f6349963c..cfad9ca71ff 100644
--- a/intern/libmv/libmv/autotrack/frame_accessor.h
+++ b/intern/libmv/libmv/autotrack/frame_accessor.h
@@ -83,7 +83,7 @@ struct FrameAccessor {
//
// Result is supposed to be a single channel image.
//
- // If region is NULL, it it assumed to be full-frame.
+ // If region is NULL, it assumed to be full-frame.
virtual Key GetMaskForTrack(int clip,
int frame,
int track,
diff --git a/intern/utfconv/utfconv.h b/intern/utfconv/utfconv.h
index 46c07500bf7..c291f1b4e1b 100644
--- a/intern/utfconv/utfconv.h
+++ b/intern/utfconv/utfconv.h
@@ -30,14 +30,14 @@ extern "C" {
#endif
/**
- * Counts how many bytes is requered for for future utf-8 string using utf-16
+ * Counts how many bytes is required for future utf-8 string using utf-16
* \param string16: pointer to working utf-16 string
* \return How many bytes must be allocated includeng NULL.
*/
size_t count_utf_8_from_16(const wchar_t *string16);
/**
- * Counts how many wchar_t (two byte) is requered for for future utf-16 string using utf-8
+ * Counts how many wchar_t (two byte) is required for future utf-16 string using utf-8
* \param string8: pointer to working utf-8 string
* \return How many bytes must be allocated includeng NULL.
*/