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/gizmo/intern | |
parent | 16fc62e15f0a749d6d64e784ea048e07d6ea3397 (diff) | |
parent | e757c4a3bec8b0e8d198531a28327332af00a9ba (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager/gizmo/intern')
-rw-r--r-- | source/blender/windowmanager/gizmo/intern/wm_gizmo.c | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c index 3a4b8af492a..0bef33a8855 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c @@ -690,7 +690,7 @@ void WM_gizmo_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 gizmos here. * this could be made a general function. diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c index 00ffc3de861..48e5ac5a072 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c @@ -258,8 +258,8 @@ bool WM_gizmomap_minmax( /** * Creates and returns idname hash table for (visible) gizmos in \a gzmap * - * \param poll Polling function for excluding gizmos. - * \param data Custom data passed to \a poll + * \param poll: Polling function for excluding gizmos. + * \param data: Custom data passed to \a poll * * TODO(campbell): this uses unreliable order, * best we use an iterator function instead of a hash. |