diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 19:23:08 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-11-07 19:23:08 +0400 |
| commit | 5ef9039b7e2ea16bd4b651aab21d5aa690485569 (patch) | |
| tree | e67247fa43d89748900b697eb9bdf0341fe53afc /intern | |
| parent | fb56dbc2afc7c8b6ffc24406ed82cbcbff090da3 (diff) | |
| parent | 5ebee683bd736ef80df939552bbe0d8e104b56df (diff) | |
Cycles: svn merge -r41531:41613 ^/trunk/blender
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/audaspace/intern/AUD_C-API.h | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_Buttons.h | 6 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_DisplayManager.h | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_EventWheel.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/intern/audaspace/intern/AUD_C-API.h b/intern/audaspace/intern/AUD_C-API.h index c7b8cb77771..2b7c94bcc5b 100644 --- a/intern/audaspace/intern/AUD_C-API.h +++ b/intern/audaspace/intern/AUD_C-API.h @@ -454,7 +454,7 @@ extern float* AUD_readSoundBuffer(const char* filename, float low, float high, /** * Pauses a playing sound after a specific amount of time. * \param handle The handle to the sound. - * \param time The time in seconds. + * \param seconds The time in seconds. * \return The silence handle. */ extern AUD_Handle* AUD_pauseAfter(AUD_Handle* handle, float seconds); diff --git a/intern/ghost/intern/GHOST_Buttons.h b/intern/ghost/intern/GHOST_Buttons.h index 7a3d8b6ae71..0209dc304e4 100644 --- a/intern/ghost/intern/GHOST_Buttons.h +++ b/intern/ghost/intern/GHOST_Buttons.h @@ -52,15 +52,15 @@ struct GHOST_Buttons { /** * Returns the state of a single button. - * @param mask. Key button to return. + * @param mask Key button to return. * @return The state of the button (pressed == true). */ virtual bool get(GHOST_TButtonMask mask) const; /** * Updates the state of a single button. - * @param mask. Button state to update. - * @param down. The new state of the button. + * @param mask Button state to update. + * @param down The new state of the button. */ virtual void set(GHOST_TButtonMask mask, bool down); diff --git a/intern/ghost/intern/GHOST_DisplayManager.h b/intern/ghost/intern/GHOST_DisplayManager.h index 8329d7be94e..d7a9b151d14 100644 --- a/intern/ghost/intern/GHOST_DisplayManager.h +++ b/intern/ghost/intern/GHOST_DisplayManager.h @@ -72,7 +72,7 @@ public: /** * Returns the number of display settings for this display device. * @param display The index of the display to query with 0 <= display < getNumDisplays(). - * @param setting The number of settings of the display device with this index. + * @param numSettings The number of settings of the display device with this index. * @return Indication of success. */ virtual GHOST_TSuccess getNumDisplaySettings(GHOST_TUns8 display, GHOST_TInt32& numSettings) const; diff --git a/intern/ghost/intern/GHOST_EventWheel.h b/intern/ghost/intern/GHOST_EventWheel.h index 0036fa60275..2a82ab8a630 100644 --- a/intern/ghost/intern/GHOST_EventWheel.h +++ b/intern/ghost/intern/GHOST_EventWheel.h @@ -26,7 +26,7 @@ */ /** \file ghost/intern/GHOST_EventWheel.h - * \ingroup GHOSTeel.h + * \ingroup GHOST * Declaration of GHOST_EventWheel class. */ |