diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-10-29 16:11:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-10-29 16:15:21 +0300 |
commit | 133f79e4492eca400d0e043733d43ca522cdb2b9 (patch) | |
tree | 52e0636dee671820e46b5bacdf5f799b48877db1 /intern | |
parent | 5c633d3ba0601afc08e7e7f5021e3c23b94d07f6 (diff) |
Cleanup: warnings, typos
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/render/graph.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_Window.h | 2 | ||||
-rw-r--r-- | intern/memutil/MEM_RefCounted.h | 4 | ||||
-rw-r--r-- | intern/memutil/MEM_RefCountedC-Api.h | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp index 45b08832fea..8fd8663b5a4 100644 --- a/intern/cycles/render/graph.cpp +++ b/intern/cycles/render/graph.cpp @@ -684,7 +684,7 @@ void ShaderGraph::bump_from_displacement() * different shifted coordinates. * * these 3 displacement values are then fed into the bump node, which will - * output the the perturbed normal. */ + * output the perturbed normal. */ ShaderInput *displacement_in = output()->input("Displacement"); diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h index e470e40d43a..15b81998aab 100644 --- a/intern/ghost/intern/GHOST_Window.h +++ b/intern/ghost/intern/GHOST_Window.h @@ -336,7 +336,7 @@ protected: GHOST_TSuccess releaseNativeHandles(); - /** The the of drawing context installed in this window. */ + /** The drawing context installed in this window. */ GHOST_TDrawingContextType m_drawingContextType; /** The window user data */ diff --git a/intern/memutil/MEM_RefCounted.h b/intern/memutil/MEM_RefCounted.h index 9da0103f6a3..88eaccf9732 100644 --- a/intern/memutil/MEM_RefCounted.h +++ b/intern/memutil/MEM_RefCounted.h @@ -41,7 +41,7 @@ * An object with reference counting. * Base class for objects with reference counting. * When a shared object is ceated, it has reference count == 1. - * If the the reference count of a shared object reaches zero, the object self-destructs. + * If the reference count of a shared object reaches zero, the object self-destructs. * The default destructor of this object has been made protected on purpose. * This disables the creation of shared objects on the stack. * @@ -72,7 +72,7 @@ public: /** * Decreases the reference count of this object. - * If the the reference count reaches zero, the object self-destructs. + * If the reference count reaches zero, the object self-destructs. * @return the new reference count. */ inline virtual int decRef(); diff --git a/intern/memutil/MEM_RefCountedC-Api.h b/intern/memutil/MEM_RefCountedC-Api.h index a611482a991..79b0b6efb66 100644 --- a/intern/memutil/MEM_RefCountedC-Api.h +++ b/intern/memutil/MEM_RefCountedC-Api.h @@ -64,7 +64,7 @@ extern int MEM_RefCountedIncRef(MEM_TRefCountedObjectPtr shared); /** * Decreases the reference count of this object. - * If the the reference count reaches zero, the object self-destructs. + * If the reference count reaches zero, the object self-destructs. * @param shared The object to query. * @return The new reference count. */ |