diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-01 19:26:42 +0300 |
commit | bfe1d0e0dc6281d33448c3d4ddfa2e231bbc5566 (patch) | |
tree | 14e9db1c58d7ffc33becc3ff5d74f4feb4c2d75e /source/blender/editors/screen | |
parent | 297bf7235bc4b2384b99f41676a8c217f2ee3249 (diff) | |
parent | 75fc1c35070e0cf247f2d2e4cffe8a6e711522ff (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r-- | source/blender/editors/screen/area.c | 4 | ||||
-rw-r--r-- | source/blender/editors/screen/glutil.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_context.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_edit.c | 2 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_intern.h | 4 | ||||
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 76 |
6 files changed, 45 insertions, 45 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 686de3b487b..2491c9f57de 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +18,7 @@ * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. * - * + * * Contributor(s): Blender Foundation * * ***** END GPL LICENSE BLOCK ***** diff --git a/source/blender/editors/screen/glutil.c b/source/blender/editors/screen/glutil.c index 39178af9e4e..5d6abea06dc 100644 --- a/source/blender/editors/screen/glutil.c +++ b/source/blender/editors/screen/glutil.c @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index 85087d58276..847cd06f45d 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index c7578741d24..da7bc9359dc 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of diff --git a/source/blender/editors/screen/screen_intern.h b/source/blender/editors/screen/screen_intern.h index b54a5e04571..adfd7b185ab 100644 --- a/source/blender/editors/screen/screen_intern.h +++ b/source/blender/editors/screen/screen_intern.h @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -18,7 +18,7 @@ * The Original Code is Copyright (C) 2008 Blender Foundation. * All rights reserved. * - * + * * Contributor(s): Blender Foundation * * ***** END GPL LICENSE BLOCK ***** diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index b3dbb6d75b9..b5729a44034 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -4,7 +4,7 @@ * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -608,21 +608,21 @@ static ARegion *screen_find_region_type(bContext *C, int type) /* operator state vars used: * none - * + * * functions: - * + * * apply() set actionzone event - * + * * exit() free customdata - * + * * callbacks: - * + * * exec() never used - * - * invoke() check if in zone + * + * invoke() check if in zone * add customdata, put mouseco and area in it * add modal handler - * + * * modal() accept modal events while doing it * call apply() with gesture info, active window, nonactive window * call exit() and remove handler when LMB confirm @@ -1154,26 +1154,26 @@ static void SCREEN_OT_area_dupli(wmOperatorType *ot) /* operator state vars used: * x, y mouse coord near edge * delta movement of edge - * + * * functions: - * + * * init() set default property values, find edge based on mouse coords, test * if the edge can be moved, select edges, calculate min and max movement - * + * * apply() apply delta on selection - * + * * exit() cleanup, send notifier - * + * * cancel() cancel moving - * + * * callbacks: - * + * * exec() execute without any user interaction, based on properties * call init(), apply(), exit() - * + * * invoke() gets called on mouse click near edge * call init(), add handler - * + * * modal() accept modal events while doing it * call apply() with delta motion * call exit() and remove handler @@ -2771,25 +2771,25 @@ static void SCREEN_OT_screen_full_area(wmOperatorType *ot) /* operator state vars used: * x1, y1 mouse coord in first area, which will disappear * x2, y2 mouse coord in 2nd area, which will become joined - * + * * functions: - * - * init() find edge based on state vars - * test if the edge divides two areas, + * + * init() find edge based on state vars + * test if the edge divides two areas, * store active and nonactive area, - * + * * apply() do the actual join - * + * * exit() cleanup, send notifier - * + * * callbacks: - * - * exec() calls init, apply, exit - * + * + * exec() calls init, apply, exit + * * invoke() sets mouse coords in x,y * call init() * add modal handler - * + * * modal() accept modal events while doing it * call apply() with active window and nonactive window * call exit() and remove handler when LMB confirm @@ -4077,21 +4077,21 @@ static void SCREEN_OT_animation_cancel(wmOperatorType *ot) * \{ */ /* operator state vars used: (added by default WM callbacks) - * xmin, ymin - * xmax, ymax - * + * xmin, ymin + * xmax, ymax + * * customdata: the wmGesture pointer - * + * * callbacks: - * + * * exec() has to be filled in by user - * + * * invoke() default WM function * adds modal handler - * - * modal() default WM function + * + * modal() default WM function * accept modal events while doing it, calls exec(), handles ESC and border drawing - * + * * poll() has to be filled in by user for context */ #if 0 |