diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-16 15:02:00 +0300 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-16 15:02:00 +0300 |
commit | 5a14dd7476a2c499da61ae0525f97f29cb4c3305 (patch) | |
tree | cee2bdcab4fbbc14a1db0610a3fed65643681cea /source/blender/windowmanager/WM_types.h | |
parent | 84ea48d58b90218f97025f94e0b924d7aea665cb (diff) | |
parent | 7c3d5a3337313663befef4c603341f6c1adf78b5 (diff) |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/editors/space_sequencer/sequencer_draw.c
Diffstat (limited to 'source/blender/windowmanager/WM_types.h')
-rw-r--r-- | source/blender/windowmanager/WM_types.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index caa2fd8f2f6..5204e9d2d1b 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -94,12 +94,12 @@ * </pre> * * A common way to get the space from the ScrArea: - * <pre> - * if (sa->spacetype == SPACE_VIEW3D) { - * View3D *v3d = sa->spacedata.first; - * ... - * } - * </pre> + * \code{.c} + * if (sa->spacetype == SPACE_VIEW3D) { + * View3D *v3d = sa->spacedata.first; + * ... + * } + * \endcode */ #ifdef __cplusplus |