diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 04:55:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-12-12 05:02:09 +0300 |
| commit | 49490e5cfbeb2b0b823aa2042401891001870a6e (patch) | |
| tree | a1d32562af2dea0c336ebd3d017a387834e936cc /source/blender/windowmanager/intern | |
| parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
| parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/intern')
5 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/windowmanager/intern/wm.c b/source/blender/windowmanager/intern/wm.c index 866c846810b..80deca46a24 100644 --- a/source/blender/windowmanager/intern/wm.c +++ b/source/blender/windowmanager/intern/wm.c @@ -125,8 +125,8 @@ void WM_operator_free_all_after(wmWindowManager *wm, struct wmOperator *op) * Use with extreme care!, * properties, customdata etc - must be compatible. * - * \param op Operator to assign the type to. - * \param ot OperatorType to assign. + * \param op: Operator to assign the type to. + * \param ot: OperatorType to assign. */ void WM_operator_type_set(wmOperator *op, wmOperatorType *ot) { diff --git a/source/blender/windowmanager/intern/wm_cursors.c b/source/blender/windowmanager/intern/wm_cursors.c index 1a1da1ed5dd..b411d9a4957 100644 --- a/source/blender/windowmanager/intern/wm_cursors.c +++ b/source/blender/windowmanager/intern/wm_cursors.c @@ -209,7 +209,7 @@ void WM_cursor_wait(bool val) } /** - * \param bounds can be NULL + * \param bounds: can be NULL */ void WM_cursor_grab_enable(wmWindow *win, bool wrap, bool hide, int bounds[4]) { diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 9df05d307cc..58773bd4283 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1009,7 +1009,7 @@ static int wm_operator_exec_notest(bContext *C, wmOperator *op) /** * for running operators with frozen context (modal handlers, menus) * - * \param store Store settings for re-use. + * \param store: Store settings for re-use. * * warning: do not use this within an operator to call its self! [#29537] */ int WM_operator_call_ex(bContext *C, wmOperator *op, diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index bdfa13c3ac3..439b4d4c75f 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -613,7 +613,7 @@ void WM_operator_properties_sanitize(PointerRNA *ptr, const bool no_context) /** set all props to their default, - * \param do_update Only update un-initialized props. + * \param do_update: Only update un-initialized props. * * \note, there's nothing specific to operators here. * this could be made a general function. diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 53db8f931a5..8be35c10ae9 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -456,7 +456,7 @@ static void wm_confirm_quit(bContext *C) * still cancel via the confirmation popup. Also, this may not quit Blender * immediately, but rather schedule the closing. * - * \param win The window to show the confirmation popup/window in. + * \param win: The window to show the confirmation popup/window in. */ void wm_quit_with_optional_confirmation_prompt(bContext *C, wmWindow *win) { |