2011-02-23 10:52:22 +00:00
|
|
|
/*
|
2007-12-24 18:27:28 +00:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
|
|
*
|
|
|
|
* 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
|
2018-06-01 18:19:39 +02:00
|
|
|
* of the License, or (at your option) any later version.
|
2007-12-24 18:27:28 +00:00
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2007-12-24 18:27:28 +00:00
|
|
|
*
|
|
|
|
* The Original Code is Copyright (C) 2007 Blender Foundation.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
2018-06-01 18:19:39 +02:00
|
|
|
*
|
2007-12-24 18:27:28 +00:00
|
|
|
* Contributor(s): Blender Foundation
|
|
|
|
*
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
*/
|
|
|
|
|
2011-02-25 14:04:21 +00:00
|
|
|
/** \file blender/windowmanager/intern/wm_operators.c
|
|
|
|
* \ingroup wm
|
2014-01-19 23:14:24 +11:00
|
|
|
*
|
|
|
|
* Functions for dealing with wmOperator, adding, removing, calling
|
|
|
|
* as well as some generic operators and shared operator properties.
|
2011-02-25 14:04:21 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
2009-01-24 16:59:55 +00:00
|
|
|
#include <float.h>
|
2007-12-24 18:27:28 +00:00
|
|
|
#include <string.h>
|
2009-07-17 12:26:40 +00:00
|
|
|
#include <ctype.h>
|
|
|
|
#include <stdio.h>
|
2010-08-13 15:26:37 +00:00
|
|
|
#include <stddef.h>
|
2010-10-31 14:43:30 +00:00
|
|
|
#include <assert.h>
|
2014-11-23 22:48:48 +01:00
|
|
|
#include <errno.h>
|
2010-11-11 20:32:28 +00:00
|
|
|
|
2014-11-28 22:16:14 +01:00
|
|
|
#ifdef WIN32
|
|
|
|
# include "GHOST_C-api.h"
|
|
|
|
#endif
|
2007-12-24 18:27:28 +00:00
|
|
|
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
|
2018-03-29 20:38:32 +02:00
|
|
|
#include "CLG_log.h"
|
|
|
|
|
2008-01-14 19:44:20 +00:00
|
|
|
#include "DNA_ID.h"
|
2009-09-14 10:56:40 +00:00
|
|
|
#include "DNA_object_types.h"
|
2.5: gesture code in WM
- Simplified and cleaned previous border code
It was a bit too complex, too many data manipulations
Original idea was to have WM API calls to manage border, circle, lines,
lasso, etc. This now means that WM provides callbacks for custom operators,
so it's very easy to make them. Check bottom of screen_edit.c for an
example.
Currently two borders were coded; with and without cross hair.
Press Bkey in any area-region to test it (note: time window has wrong matrix!)
Some specs to note:
- gestures are in region space, and draw 'over'. That latter still needs some
work when we do real composites.
- only the active region is redrawn.
- on todo is the generic gesture engine for 'tweak' or like how currently grab
gestures in Blender work. These will be configurable per area-region, and WM
then will send the proper "Gesture Event" with properties (N, S, E, W, etc)
to which you then can assign operators. Such events will be generated with low
priority, so other handlers who swallowed mouse events have preference.
2008-11-19 13:16:05 +00:00
|
|
|
#include "DNA_screen_types.h"
|
2009-05-19 15:37:50 +00:00
|
|
|
#include "DNA_scene_types.h"
|
2008-12-19 18:28:37 +00:00
|
|
|
#include "DNA_userdef_types.h"
|
2007-12-24 18:27:28 +00:00
|
|
|
#include "DNA_windowmanager_types.h"
|
2017-10-21 16:19:48 +11:00
|
|
|
#include "DNA_workspace_types.h"
|
2007-12-24 18:27:28 +00:00
|
|
|
|
2015-08-16 17:32:01 +10:00
|
|
|
#include "BLT_translation.h"
|
2010-01-08 05:51:51 +00:00
|
|
|
|
2009-05-19 12:54:54 +00:00
|
|
|
#include "PIL_time.h"
|
|
|
|
|
2007-12-24 18:27:28 +00:00
|
|
|
#include "BLI_blenlib.h"
|
2018-02-18 21:27:33 +11:00
|
|
|
#include "BLI_dial_2d.h"
|
2008-12-26 03:56:52 +00:00
|
|
|
#include "BLI_dynstr.h" /*for WM_operator_pystring */
|
2010-01-26 11:25:39 +00:00
|
|
|
#include "BLI_math.h"
|
2011-01-07 18:36:47 +00:00
|
|
|
#include "BLI_utildefines.h"
|
2011-08-11 06:06:17 +00:00
|
|
|
#include "BLI_ghash.h"
|
2007-12-24 18:27:28 +00:00
|
|
|
|
2009-09-12 19:54:39 +00:00
|
|
|
#include "BLO_readfile.h"
|
|
|
|
|
2014-11-23 14:37:13 +01:00
|
|
|
#include "BKE_appdir.h"
|
2016-04-24 22:42:41 +10:00
|
|
|
#include "BKE_blender_version.h"
|
2011-05-12 01:57:47 +00:00
|
|
|
#include "BKE_brush.h"
|
2008-12-18 02:56:48 +00:00
|
|
|
#include "BKE_context.h"
|
2018-11-07 18:00:24 +01:00
|
|
|
#include "BKE_global.h"
|
2015-08-10 17:26:37 +02:00
|
|
|
#include "BKE_icons.h"
|
2.5: work on bringing back SpaceTime options
- RMB select, also with SHIFT
- RMB tweak for translate
- SHIFT+D dupli
- BKEY border select/deselect
- AKEY (de)select all
- XKEY delete
- GKEY grab
Added some XXX comments for future todos, especially for when other
spaces come back with time markers.
Also added ED_util for putting in all to-be-cleaned cruft
Context conflict: input methods for Markers can conflict with other
spacetypes. It was solved in pre-2.5 with manually tweaking it all over,
but I would prefer one keymap for all marker stuff. Needs some thinking...
could be solved with a boundbox check for bottom part of 2d window.
Tweak issue: both tweak styles are possible:
- Hold mouse button, move, operator ends on mouse release
- Hold mouse button, move, operator ends on mouse click
Problem is that modally handled operators use fixed keymaps... like ESC,
SPACE, ENTER, or press/release mousebutton for 'assign'. There's a lot
to say for making this all consistant, or become part of 1 general keymap?
Should also be possibe to define 'tweak' defaults for Tablet different
than for mouse...
2008-11-29 15:10:31 +00:00
|
|
|
#include "BKE_idprop.h"
|
2012-04-24 02:01:23 +00:00
|
|
|
#include "BKE_image.h"
|
2007-12-24 18:27:28 +00:00
|
|
|
#include "BKE_library.h"
|
2015-01-12 14:44:54 +01:00
|
|
|
#include "BKE_library_query.h"
|
2007-12-24 18:27:28 +00:00
|
|
|
#include "BKE_main.h"
|
2013-01-22 04:24:01 +00:00
|
|
|
#include "BKE_material.h"
|
2009-09-12 19:54:39 +00:00
|
|
|
#include "BKE_report.h"
|
2009-05-19 15:37:50 +00:00
|
|
|
#include "BKE_scene.h"
|
2009-10-06 13:04:31 +00:00
|
|
|
#include "BKE_screen.h" /* BKE_ST_MAXNAME */
|
2014-11-17 15:44:19 +01:00
|
|
|
#include "BKE_unit.h"
|
2011-01-07 19:18:31 +00:00
|
|
|
|
2010-08-10 15:14:19 +00:00
|
|
|
#include "BKE_idcode.h"
|
2007-12-24 18:27:28 +00:00
|
|
|
|
2011-06-10 04:36:51 +00:00
|
|
|
#include "BLF_api.h"
|
2009-05-19 12:54:54 +00:00
|
|
|
|
2017-02-28 15:29:51 -05:00
|
|
|
#include "GPU_immediate.h"
|
2017-04-05 18:30:14 +10:00
|
|
|
#include "GPU_immediate_util.h"
|
2017-03-21 02:51:02 -04:00
|
|
|
#include "GPU_matrix.h"
|
2017-02-28 15:29:51 -05:00
|
|
|
|
2009-01-24 22:58:22 +00:00
|
|
|
#include "IMB_imbuf_types.h"
|
2011-09-17 16:57:37 +00:00
|
|
|
#include "IMB_imbuf.h"
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2014-11-17 15:44:19 +01:00
|
|
|
#include "ED_numinput.h"
|
2009-01-06 14:42:54 +00:00
|
|
|
#include "ED_screen.h"
|
2018-04-02 15:02:08 +02:00
|
|
|
#include "ED_undo.h"
|
2012-12-09 10:48:18 +00:00
|
|
|
#include "ED_view3d.h"
|
2009-01-06 14:42:54 +00:00
|
|
|
|
2008-11-21 19:14:38 +00:00
|
|
|
#include "RNA_access.h"
|
|
|
|
#include "RNA_define.h"
|
2011-02-13 14:16:36 +00:00
|
|
|
#include "RNA_enum_types.h"
|
2008-11-21 19:14:38 +00:00
|
|
|
|
2008-12-15 19:19:39 +00:00
|
|
|
#include "UI_interface.h"
|
2015-01-12 14:44:54 +01:00
|
|
|
#include "UI_interface_icons.h"
|
2008-12-17 15:38:40 +00:00
|
|
|
#include "UI_resources.h"
|
2008-12-15 19:19:39 +00:00
|
|
|
|
2007-12-24 18:27:28 +00:00
|
|
|
#include "WM_api.h"
|
|
|
|
#include "WM_types.h"
|
2.5: gesture code in WM
- Simplified and cleaned previous border code
It was a bit too complex, too many data manipulations
Original idea was to have WM API calls to manage border, circle, lines,
lasso, etc. This now means that WM provides callbacks for custom operators,
so it's very easy to make them. Check bottom of screen_edit.c for an
example.
Currently two borders were coded; with and without cross hair.
Press Bkey in any area-region to test it (note: time window has wrong matrix!)
Some specs to note:
- gestures are in region space, and draw 'over'. That latter still needs some
work when we do real composites.
- only the active region is redrawn.
- on todo is the generic gesture engine for 'tweak' or like how currently grab
gestures in Blender work. These will be configurable per area-region, and WM
then will send the proper "Gesture Event" with properties (N, S, E, W, etc)
to which you then can assign operators. Such events will be generated with low
priority, so other handlers who swallowed mouse events have preference.
2008-11-19 13:16:05 +00:00
|
|
|
|
2008-11-24 10:45:36 +00:00
|
|
|
#include "wm.h"
|
2009-05-19 12:54:54 +00:00
|
|
|
#include "wm_draw.h"
|
2007-12-24 18:27:28 +00:00
|
|
|
#include "wm_event_system.h"
|
2009-11-05 17:32:06 +00:00
|
|
|
#include "wm_event_types.h"
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
#include "wm_files.h"
|
2009-05-19 12:54:54 +00:00
|
|
|
#include "wm_window.h"
|
2007-12-24 18:27:28 +00:00
|
|
|
|
2013-02-28 15:31:20 +00:00
|
|
|
#define UNDOCUMENTED_OPERATOR_TIP N_("(undocumented operator)")
|
|
|
|
|
2007-12-24 18:27:28 +00:00
|
|
|
/* ************ operator API, exported ********** */
|
2014-10-28 15:47:51 +01:00
|
|
|
|
2009-07-17 12:26:40 +00:00
|
|
|
/* SOME_OT_op -> some.op */
|
2009-07-18 19:42:13 +00:00
|
|
|
void WM_operator_py_idname(char *to, const char *from)
|
2009-07-17 12:26:40 +00:00
|
|
|
{
|
2014-04-27 00:21:43 +10:00
|
|
|
const char *sep = strstr(from, "_OT_");
|
2012-03-24 06:24:53 +00:00
|
|
|
if (sep) {
|
2012-03-27 01:24:16 +00:00
|
|
|
int ofs = (sep - from);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2011-05-26 09:58:22 +00:00
|
|
|
/* note, we use ascii tolower instead of system tolower, because the
|
2014-07-21 10:53:07 +10:00
|
|
|
* latter depends on the locale, and can lead to idname mismatch */
|
2012-03-27 01:24:16 +00:00
|
|
|
memcpy(to, from, sizeof(char) * ofs);
|
2015-07-14 09:17:00 +10:00
|
|
|
BLI_str_tolower_ascii(to, ofs);
|
2009-07-17 12:26:40 +00:00
|
|
|
|
|
|
|
to[ofs] = '.';
|
2013-07-15 05:11:14 +00:00
|
|
|
BLI_strncpy(to + (ofs + 1), sep + 4, OP_MAX_TYPENAME - (ofs + 1));
|
2009-07-17 12:26:40 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-03-09 00:41:09 +00:00
|
|
|
/* should not happen but support just in case */
|
2009-07-17 12:26:40 +00:00
|
|
|
BLI_strncpy(to, from, OP_MAX_TYPENAME);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* some.op -> SOME_OT_op */
|
2009-07-18 19:42:13 +00:00
|
|
|
void WM_operator_bl_idname(char *to, const char *from)
|
2009-07-17 12:26:40 +00:00
|
|
|
{
|
2009-09-08 02:09:14 +00:00
|
|
|
if (from) {
|
2014-04-27 00:21:43 +10:00
|
|
|
const char *sep = strchr(from, '.');
|
2009-07-17 12:26:40 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (sep) {
|
2012-03-27 01:24:16 +00:00
|
|
|
int ofs = (sep - from);
|
2009-07-17 12:26:40 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
memcpy(to, from, sizeof(char) * ofs);
|
2015-07-14 09:17:00 +10:00
|
|
|
BLI_str_toupper_ascii(to, ofs);
|
2013-07-15 05:11:14 +00:00
|
|
|
strcpy(to + ofs, "_OT_");
|
|
|
|
strcpy(to + (ofs + 4), sep + 1);
|
2009-09-08 02:09:14 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-03-09 00:41:09 +00:00
|
|
|
/* should not happen but support just in case */
|
2009-09-08 02:09:14 +00:00
|
|
|
BLI_strncpy(to, from, OP_MAX_TYPENAME);
|
|
|
|
}
|
2009-07-17 12:26:40 +00:00
|
|
|
}
|
2009-09-08 02:09:14 +00:00
|
|
|
else
|
2012-03-27 01:24:16 +00:00
|
|
|
to[0] = 0;
|
2009-07-17 12:26:40 +00:00
|
|
|
}
|
|
|
|
|
2017-08-23 18:17:42 +10:00
|
|
|
/**
|
|
|
|
* Sanity check to ensure #WM_operator_bl_idname won't fail.
|
|
|
|
* \returns true when there are no problems with \a idname, otherwise report an error.
|
|
|
|
*/
|
|
|
|
bool WM_operator_py_idname_ok_or_report(ReportList *reports, const char *classname, const char *idname)
|
|
|
|
{
|
|
|
|
const char *ch = idname;
|
|
|
|
int dot = 0;
|
|
|
|
int i;
|
|
|
|
for (i = 0; *ch; i++, ch++) {
|
|
|
|
if ((*ch >= 'a' && *ch <= 'z') || (*ch >= '0' && *ch <= '9') || *ch == '_') {
|
|
|
|
/* pass */
|
|
|
|
}
|
|
|
|
else if (*ch == '.') {
|
|
|
|
dot++;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BKE_reportf(reports, RPT_ERROR,
|
|
|
|
"Registering operator class: '%s', invalid bl_idname '%s', at position %d",
|
|
|
|
classname, idname, i);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i > (MAX_NAME - 3)) {
|
|
|
|
BKE_reportf(reports, RPT_ERROR, "Registering operator class: '%s', invalid bl_idname '%s', "
|
|
|
|
"is too long, maximum length is %d", classname, idname,
|
|
|
|
MAX_NAME - 3);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (dot != 1) {
|
|
|
|
BKE_reportf(reports, RPT_ERROR,
|
|
|
|
"Registering operator class: '%s', invalid bl_idname '%s', must contain 1 '.' character",
|
|
|
|
classname, idname);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-06-01 14:56:07 +10:00
|
|
|
/**
|
|
|
|
* Print a string representation of the operator, with the args that it runs so python can run it again.
|
2009-07-29 23:12:30 +00:00
|
|
|
*
|
2013-11-06 20:56:18 +00:00
|
|
|
* When calling from an existing wmOperator, better to use simple version:
|
2015-06-01 14:56:07 +10:00
|
|
|
* `WM_operator_pystring(C, op);`
|
2013-11-06 20:56:18 +00:00
|
|
|
*
|
2015-06-01 14:56:07 +10:00
|
|
|
* \note Both \a op and \a opptr may be `NULL` (\a op is only used for macro operators).
|
2009-07-29 23:12:30 +00:00
|
|
|
*/
|
2013-11-26 08:59:14 +11:00
|
|
|
char *WM_operator_pystring_ex(bContext *C, wmOperator *op, const bool all_args, const bool macro_args,
|
|
|
|
wmOperatorType *ot, PointerRNA *opptr)
|
2008-12-26 03:56:52 +00:00
|
|
|
{
|
2009-07-17 12:26:40 +00:00
|
|
|
char idname_py[OP_MAX_TYPENAME];
|
2008-12-26 03:56:52 +00:00
|
|
|
|
|
|
|
/* for building the string */
|
2012-03-27 01:24:16 +00:00
|
|
|
DynStr *dynstr = BLI_dynstr_new();
|
2012-03-20 07:41:47 +00:00
|
|
|
char *cstring;
|
|
|
|
char *cstring_args;
|
2009-07-29 23:48:06 +00:00
|
|
|
|
2013-05-15 14:37:01 +00:00
|
|
|
/* arbitrary, but can get huge string with stroke painting otherwise */
|
|
|
|
int max_prop_length = 10;
|
|
|
|
|
2013-11-06 20:56:18 +00:00
|
|
|
WM_operator_py_idname(idname_py, ot->idname);
|
|
|
|
BLI_dynstr_appendf(dynstr, "bpy.ops.%s(", idname_py);
|
|
|
|
|
|
|
|
if (op && op->macro.first) {
|
|
|
|
/* Special handling for macros, else we only get default values in this case... */
|
|
|
|
wmOperator *opm;
|
|
|
|
bool first_op = true;
|
2013-11-26 08:59:14 +11:00
|
|
|
|
|
|
|
opm = macro_args ? op->macro.first : NULL;
|
|
|
|
|
|
|
|
for (; opm; opm = opm->next) {
|
2013-11-06 20:56:18 +00:00
|
|
|
PointerRNA *opmptr = opm->ptr;
|
|
|
|
PointerRNA opmptr_default;
|
|
|
|
if (opmptr == NULL) {
|
|
|
|
WM_operator_properties_create_ptr(&opmptr_default, opm->type);
|
|
|
|
opmptr = &opmptr_default;
|
|
|
|
}
|
|
|
|
|
|
|
|
cstring_args = RNA_pointer_as_string_id(C, opmptr);
|
|
|
|
if (first_op) {
|
|
|
|
BLI_dynstr_appendf(dynstr, "%s=%s", opm->type->idname, cstring_args);
|
|
|
|
first_op = false;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
BLI_dynstr_appendf(dynstr, ", %s=%s", opm->type->idname, cstring_args);
|
|
|
|
}
|
|
|
|
MEM_freeN(cstring_args);
|
2012-03-20 07:41:47 +00:00
|
|
|
|
2013-11-06 20:56:18 +00:00
|
|
|
if (opmptr == &opmptr_default) {
|
|
|
|
WM_operator_properties_free(&opmptr_default);
|
|
|
|
}
|
|
|
|
}
|
2009-07-29 23:48:06 +00:00
|
|
|
}
|
2013-11-06 20:56:18 +00:00
|
|
|
else {
|
2018-09-24 17:27:41 +02:00
|
|
|
/* only to get the original props for comparisons */
|
2013-11-06 20:56:18 +00:00
|
|
|
PointerRNA opptr_default;
|
2013-11-26 08:59:14 +11:00
|
|
|
const bool macro_args_test = ot->macro.first ? macro_args : true;
|
2009-07-29 23:48:06 +00:00
|
|
|
|
2013-11-06 20:56:18 +00:00
|
|
|
if (opptr == NULL) {
|
|
|
|
WM_operator_properties_create_ptr(&opptr_default, ot);
|
|
|
|
opptr = &opptr_default;
|
|
|
|
}
|
2008-12-26 03:56:52 +00:00
|
|
|
|
2013-11-26 08:59:14 +11:00
|
|
|
cstring_args = RNA_pointer_as_string_keywords(C, opptr, false, all_args, macro_args_test, max_prop_length);
|
2013-11-06 20:56:18 +00:00
|
|
|
BLI_dynstr_append(dynstr, cstring_args);
|
|
|
|
MEM_freeN(cstring_args);
|
2008-12-26 03:56:52 +00:00
|
|
|
|
2013-11-06 20:56:18 +00:00
|
|
|
if (opptr == &opptr_default) {
|
|
|
|
WM_operator_properties_free(&opptr_default);
|
|
|
|
}
|
|
|
|
}
|
2009-07-29 23:48:06 +00:00
|
|
|
|
2008-12-26 03:56:52 +00:00
|
|
|
BLI_dynstr_append(dynstr, ")");
|
|
|
|
|
|
|
|
cstring = BLI_dynstr_get_cstring(dynstr);
|
|
|
|
BLI_dynstr_free(dynstr);
|
|
|
|
return cstring;
|
|
|
|
}
|
|
|
|
|
2013-11-26 08:59:14 +11:00
|
|
|
char *WM_operator_pystring(bContext *C, wmOperator *op,
|
|
|
|
const bool all_args, const bool macro_args)
|
2013-11-06 20:56:18 +00:00
|
|
|
{
|
2013-11-26 08:59:14 +11:00
|
|
|
return WM_operator_pystring_ex(C, op, all_args, macro_args, op->type, op->ptr);
|
2013-11-06 20:56:18 +00:00
|
|
|
}
|
|
|
|
|
2013-12-09 14:20:53 +11:00
|
|
|
|
|
|
|
/**
|
|
|
|
* \return true if the string was shortened
|
|
|
|
*/
|
|
|
|
bool WM_operator_pystring_abbreviate(char *str, int str_len_max)
|
|
|
|
{
|
|
|
|
const int str_len = strlen(str);
|
|
|
|
const char *parens_start = strchr(str, '(');
|
|
|
|
|
|
|
|
if (parens_start) {
|
|
|
|
const int parens_start_pos = parens_start - str;
|
|
|
|
const char *parens_end = strrchr(parens_start + 1, ')');
|
|
|
|
|
|
|
|
if (parens_end) {
|
|
|
|
const int parens_len = parens_end - parens_start;
|
|
|
|
|
|
|
|
if (parens_len > str_len_max) {
|
|
|
|
const char *comma_first = strchr(parens_start, ',');
|
|
|
|
|
|
|
|
/* truncate after the first comma */
|
|
|
|
if (comma_first) {
|
|
|
|
const char end_str[] = " ... )";
|
|
|
|
const int end_str_len = sizeof(end_str) - 1;
|
|
|
|
|
|
|
|
/* leave a place for the first argument*/
|
|
|
|
const int new_str_len = (comma_first - parens_start) + 1;
|
|
|
|
|
|
|
|
if (str_len >= new_str_len + parens_start_pos + end_str_len + 1) {
|
|
|
|
/* append " ... )" to the string after the comma */
|
|
|
|
memcpy(str + new_str_len + parens_start_pos, end_str, end_str_len + 1);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2012-12-18 16:20:30 +00:00
|
|
|
/* return NULL if no match is found */
|
2013-01-22 04:24:01 +00:00
|
|
|
#if 0
|
2018-06-30 20:59:10 +02:00
|
|
|
static const char *wm_context_member_from_ptr(bContext *C, const PointerRNA *ptr)
|
2012-12-18 16:20:30 +00:00
|
|
|
{
|
|
|
|
/* loop over all context items and do 2 checks
|
|
|
|
*
|
|
|
|
* - see if the pointer is in the context.
|
|
|
|
* - see if the pointers ID is in the context.
|
|
|
|
*/
|
|
|
|
|
2012-12-19 02:08:58 +00:00
|
|
|
/* don't get from the context store since this is normally set only for the UI and not usable elsewhere */
|
2014-04-01 11:34:00 +11:00
|
|
|
ListBase lb = CTX_data_dir_get_ex(C, false, true, true);
|
2012-12-18 16:20:30 +00:00
|
|
|
LinkData *link;
|
|
|
|
|
|
|
|
const char *member_found = NULL;
|
|
|
|
const char *member_id = NULL;
|
|
|
|
|
|
|
|
for (link = lb.first; link; link = link->next) {
|
|
|
|
const char *identifier = link->data;
|
2018-06-30 18:05:01 +02:00
|
|
|
PointerRNA ctx_item_ptr = {{0}}; // CTX_data_pointer_get(C, identifier); // XXX, this isnt working
|
2012-12-18 16:20:30 +00:00
|
|
|
|
2012-12-19 02:08:58 +00:00
|
|
|
if (ctx_item_ptr.type == NULL) {
|
2012-12-18 16:52:46 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2012-12-19 02:08:58 +00:00
|
|
|
if (ptr->id.data == ctx_item_ptr.id.data) {
|
|
|
|
if ((ptr->data == ctx_item_ptr.data) &&
|
|
|
|
(ptr->type == ctx_item_ptr.type))
|
2012-12-18 16:20:30 +00:00
|
|
|
{
|
|
|
|
/* found! */
|
|
|
|
member_found = identifier;
|
|
|
|
break;
|
|
|
|
}
|
2012-12-19 02:08:58 +00:00
|
|
|
else if (RNA_struct_is_ID(ctx_item_ptr.type)) {
|
2012-12-18 16:20:30 +00:00
|
|
|
/* we found a reference to this ID,
|
|
|
|
* so fallback to it if there is no direct reference */
|
|
|
|
member_id = identifier;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-06-30 18:05:01 +02:00
|
|
|
BLI_freelistN(&lb);
|
2012-12-18 16:20:30 +00:00
|
|
|
|
|
|
|
if (member_found) {
|
2018-06-30 18:05:01 +02:00
|
|
|
return member_found;
|
2012-12-18 16:20:30 +00:00
|
|
|
}
|
|
|
|
else if (member_id) {
|
2018-06-30 18:05:01 +02:00
|
|
|
return member_id;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return NULL;
|
2012-12-18 16:20:30 +00:00
|
|
|
}
|
|
|
|
}
|
2018-06-30 18:05:01 +02:00
|
|
|
|
2013-01-22 04:24:01 +00:00
|
|
|
#else
|
|
|
|
|
|
|
|
/* use hard coded checks for now */
|
2018-06-30 18:05:01 +02:00
|
|
|
|
2018-06-30 20:59:10 +02:00
|
|
|
static const char *wm_context_member_from_ptr(bContext *C, const PointerRNA *ptr)
|
2013-01-22 04:24:01 +00:00
|
|
|
{
|
|
|
|
const char *member_id = NULL;
|
|
|
|
|
|
|
|
if (ptr->id.data) {
|
|
|
|
|
|
|
|
#define CTX_TEST_PTR_ID(C, member, idptr) \
|
|
|
|
{ \
|
|
|
|
const char *ctx_member = member; \
|
|
|
|
PointerRNA ctx_item_ptr = CTX_data_pointer_get(C, ctx_member); \
|
|
|
|
if (ctx_item_ptr.id.data == idptr) { \
|
|
|
|
member_id = ctx_member; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
} (void)0
|
|
|
|
|
|
|
|
#define CTX_TEST_PTR_ID_CAST(C, member, member_full, cast, idptr) \
|
|
|
|
{ \
|
|
|
|
const char *ctx_member = member; \
|
|
|
|
const char *ctx_member_full = member_full; \
|
|
|
|
PointerRNA ctx_item_ptr = CTX_data_pointer_get(C, ctx_member); \
|
|
|
|
if (ctx_item_ptr.id.data && cast(ctx_item_ptr.id.data) == idptr) { \
|
|
|
|
member_id = ctx_member_full; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
} (void)0
|
|
|
|
|
2013-06-03 00:46:20 +00:00
|
|
|
#define CTX_TEST_PTR_DATA_TYPE(C, member, rna_type, rna_ptr, dataptr_cmp) \
|
|
|
|
{ \
|
|
|
|
const char *ctx_member = member; \
|
|
|
|
if (RNA_struct_is_a((ptr)->type, &(rna_type)) && (ptr)->data == (dataptr_cmp)) { \
|
|
|
|
member_id = ctx_member; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
} (void)0
|
|
|
|
|
2017-07-29 15:23:01 +03:00
|
|
|
#define CTX_TEST_SPACE_TYPE(space_data_type, member_full, dataptr_cmp) \
|
|
|
|
{ \
|
|
|
|
const char *ctx_member_full = member_full; \
|
|
|
|
if (space_data->spacetype == space_data_type && ptr->data == dataptr_cmp) { \
|
|
|
|
member_id = ctx_member_full; \
|
|
|
|
break; \
|
|
|
|
} \
|
|
|
|
} (void)0
|
|
|
|
|
2013-06-03 00:46:20 +00:00
|
|
|
switch (GS(((ID *)ptr->id.data)->name)) {
|
2013-01-22 04:24:01 +00:00
|
|
|
case ID_SCE:
|
|
|
|
{
|
2018-07-31 10:22:19 +02:00
|
|
|
CTX_TEST_PTR_DATA_TYPE(C, "active_gpencil_brush", RNA_Brush, ptr, CTX_data_active_gpencil_brush(C));
|
2013-01-22 04:24:01 +00:00
|
|
|
CTX_TEST_PTR_ID(C, "scene", ptr->id.data);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case ID_OB:
|
|
|
|
{
|
|
|
|
CTX_TEST_PTR_ID(C, "object", ptr->id.data);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* from rna_Main_objects_new */
|
|
|
|
case OB_DATA_SUPPORT_ID_CASE:
|
|
|
|
{
|
|
|
|
#define ID_CAST_OBDATA(id_pt) (((Object *)(id_pt))->data)
|
|
|
|
CTX_TEST_PTR_ID_CAST(C, "object", "object.data", ID_CAST_OBDATA, ptr->id.data);
|
|
|
|
break;
|
|
|
|
#undef ID_CAST_OBDATA
|
|
|
|
}
|
|
|
|
case ID_MA:
|
|
|
|
{
|
|
|
|
#define ID_CAST_OBMATACT(id_pt) (give_current_material(((Object *)id_pt), ((Object *)id_pt)->actcol))
|
|
|
|
CTX_TEST_PTR_ID_CAST(C, "object", "object.active_material", ID_CAST_OBMATACT, ptr->id.data);
|
|
|
|
break;
|
|
|
|
#undef ID_CAST_OBMATACT
|
|
|
|
}
|
|
|
|
case ID_WO:
|
|
|
|
{
|
|
|
|
#define ID_CAST_SCENEWORLD(id_pt) (((Scene *)(id_pt))->world)
|
|
|
|
CTX_TEST_PTR_ID_CAST(C, "scene", "scene.world", ID_CAST_SCENEWORLD, ptr->id.data);
|
|
|
|
break;
|
|
|
|
#undef ID_CAST_SCENEWORLD
|
|
|
|
}
|
|
|
|
case ID_SCR:
|
|
|
|
{
|
|
|
|
CTX_TEST_PTR_ID(C, "screen", ptr->id.data);
|
2013-06-03 00:46:20 +00:00
|
|
|
|
2017-07-29 15:23:01 +03:00
|
|
|
SpaceLink *space_data = CTX_wm_space_data(C);
|
|
|
|
|
|
|
|
CTX_TEST_PTR_DATA_TYPE(C, "space_data", RNA_Space, ptr, space_data);
|
2018-06-30 17:41:51 +02:00
|
|
|
CTX_TEST_PTR_DATA_TYPE(C, "space_data", RNA_View3DOverlay, ptr, space_data);
|
|
|
|
CTX_TEST_PTR_DATA_TYPE(C, "space_data", RNA_View3DShading, ptr, space_data);
|
2013-06-03 00:46:20 +00:00
|
|
|
CTX_TEST_PTR_DATA_TYPE(C, "area", RNA_Area, ptr, CTX_wm_area(C));
|
|
|
|
CTX_TEST_PTR_DATA_TYPE(C, "region", RNA_Region, ptr, CTX_wm_region(C));
|
|
|
|
|
2017-07-29 15:23:01 +03:00
|
|
|
CTX_TEST_SPACE_TYPE(SPACE_IMAGE, "space_data.uv_editor", space_data);
|
|
|
|
CTX_TEST_SPACE_TYPE(SPACE_VIEW3D, "space_data.fx_settings", &(CTX_wm_view3d(C)->fx_settings));
|
|
|
|
CTX_TEST_SPACE_TYPE(SPACE_NLA, "space_data.dopesheet", CTX_wm_space_nla(C)->ads);
|
|
|
|
CTX_TEST_SPACE_TYPE(SPACE_IPO, "space_data.dopesheet", CTX_wm_space_graph(C)->ads);
|
|
|
|
CTX_TEST_SPACE_TYPE(SPACE_ACTION, "space_data.dopesheet", &(CTX_wm_space_action(C)->ads));
|
|
|
|
CTX_TEST_SPACE_TYPE(SPACE_FILE, "space_data.params", CTX_wm_space_file(C)->params);
|
2013-01-22 04:24:01 +00:00
|
|
|
break;
|
|
|
|
}
|
2017-08-28 11:19:58 +02:00
|
|
|
default:
|
|
|
|
break;
|
2013-01-22 04:24:01 +00:00
|
|
|
}
|
|
|
|
#undef CTX_TEST_PTR_ID
|
|
|
|
#undef CTX_TEST_PTR_ID_CAST
|
2017-07-29 15:23:01 +03:00
|
|
|
#undef CTX_TEST_SPACE_TYPE
|
2013-01-22 04:24:01 +00:00
|
|
|
}
|
|
|
|
|
2018-06-30 18:05:01 +02:00
|
|
|
return member_id;
|
2013-01-22 04:24:01 +00:00
|
|
|
}
|
|
|
|
#endif
|
2012-12-18 16:20:30 +00:00
|
|
|
|
2018-06-30 18:05:01 +02:00
|
|
|
static char *wm_prop_pystring_from_context(bContext *C, PointerRNA *ptr, PropertyRNA *prop, int index)
|
|
|
|
{
|
|
|
|
const char *member_id = wm_context_member_from_ptr(C, ptr);
|
|
|
|
char *ret = NULL;
|
|
|
|
if (member_id != NULL) {
|
|
|
|
char *prop_str = RNA_path_struct_property_py(ptr, prop, index);
|
|
|
|
if (prop_str) {
|
|
|
|
ret = BLI_sprintfN("bpy.context.%s.%s", member_id, prop_str);
|
|
|
|
MEM_freeN(prop_str);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-06-30 20:59:10 +02:00
|
|
|
const char *WM_context_member_from_ptr(bContext *C, const PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
return wm_context_member_from_ptr(C, ptr);
|
|
|
|
}
|
|
|
|
|
2012-12-18 15:22:06 +00:00
|
|
|
char *WM_prop_pystring_assign(bContext *C, PointerRNA *ptr, PropertyRNA *prop, int index)
|
2012-12-18 14:11:19 +00:00
|
|
|
{
|
2012-12-18 15:22:06 +00:00
|
|
|
char *lhs, *rhs, *ret;
|
2012-12-18 14:11:19 +00:00
|
|
|
|
2012-12-18 16:20:30 +00:00
|
|
|
lhs = C ? wm_prop_pystring_from_context(C, ptr, prop, index) : NULL;
|
|
|
|
|
|
|
|
if (lhs == NULL) {
|
|
|
|
/* fallback to bpy.data.foo[id] if we dont find in the context */
|
|
|
|
lhs = RNA_path_full_property_py(ptr, prop, index);
|
|
|
|
}
|
|
|
|
|
2012-12-18 15:22:06 +00:00
|
|
|
if (!lhs) {
|
2012-12-18 14:11:19 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2013-05-15 14:37:01 +00:00
|
|
|
rhs = RNA_property_as_string(C, ptr, prop, index, INT_MAX);
|
2012-12-18 15:22:06 +00:00
|
|
|
if (!rhs) {
|
|
|
|
MEM_freeN(lhs);
|
2012-12-18 14:11:19 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = BLI_sprintfN("%s = %s", lhs, rhs);
|
|
|
|
MEM_freeN(lhs);
|
|
|
|
MEM_freeN(rhs);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-11-24 16:19:15 +00:00
|
|
|
void WM_operator_properties_create_ptr(PointerRNA *ptr, wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
RNA_pointer_create(NULL, ot->srna, NULL, ptr);
|
|
|
|
}
|
|
|
|
|
2009-01-01 20:44:40 +00:00
|
|
|
void WM_operator_properties_create(PointerRNA *ptr, const char *opstring)
|
|
|
|
{
|
2017-03-22 19:41:03 +01:00
|
|
|
wmOperatorType *ot = WM_operatortype_find(opstring, false);
|
2009-01-01 20:44:40 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (ot)
|
2009-11-24 16:19:15 +00:00
|
|
|
WM_operator_properties_create_ptr(ptr, ot);
|
2009-01-01 20:44:40 +00:00
|
|
|
else
|
2009-01-15 04:13:38 +00:00
|
|
|
RNA_pointer_create(NULL, &RNA_OperatorProperties, NULL, ptr);
|
2009-01-01 20:44:40 +00:00
|
|
|
}
|
|
|
|
|
2009-10-12 12:54:08 +00:00
|
|
|
/* similar to the function above except its uses ID properties
|
|
|
|
* used for keymaps and macros */
|
|
|
|
void WM_operator_properties_alloc(PointerRNA **ptr, IDProperty **properties, const char *opstring)
|
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
if (*properties == NULL) {
|
2009-10-12 12:54:08 +00:00
|
|
|
IDPropertyTemplate val = {0};
|
2012-03-27 01:24:16 +00:00
|
|
|
*properties = IDP_New(IDP_GROUP, &val, "wmOpItemProp");
|
2009-10-12 12:54:08 +00:00
|
|
|
}
|
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
if (*ptr == NULL) {
|
|
|
|
*ptr = MEM_callocN(sizeof(PointerRNA), "wmOpItemPtr");
|
2009-10-12 12:54:08 +00:00
|
|
|
WM_operator_properties_create(*ptr, opstring);
|
|
|
|
}
|
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
(*ptr)->data = *properties;
|
2009-10-12 12:54:08 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2013-04-04 02:05:11 +00:00
|
|
|
void WM_operator_properties_sanitize(PointerRNA *ptr, const bool no_context)
|
2010-01-27 21:19:39 +00:00
|
|
|
{
|
2013-08-24 10:05:29 +00:00
|
|
|
RNA_STRUCT_BEGIN (ptr, prop)
|
2012-04-30 16:22:40 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
switch (RNA_property_type(prop)) {
|
|
|
|
case PROP_ENUM:
|
|
|
|
if (no_context)
|
|
|
|
RNA_def_property_flag(prop, PROP_ENUM_NO_CONTEXT);
|
|
|
|
else
|
|
|
|
RNA_def_property_clear_flag(prop, PROP_ENUM_NO_CONTEXT);
|
|
|
|
break;
|
|
|
|
case PROP_POINTER:
|
2010-01-27 21:19:39 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
StructRNA *ptype = RNA_property_pointer_type(ptr, prop);
|
2010-01-27 21:19:39 +00:00
|
|
|
|
|
|
|
/* recurse into operator properties */
|
|
|
|
if (RNA_struct_is_a(ptype, &RNA_OperatorProperties)) {
|
|
|
|
PointerRNA opptr = RNA_property_pointer_get(ptr, prop);
|
2010-11-23 12:05:35 +00:00
|
|
|
WM_operator_properties_sanitize(&opptr, no_context);
|
2010-01-27 21:19:39 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
2012-03-27 01:24:16 +00:00
|
|
|
default:
|
|
|
|
break;
|
2010-01-27 21:19:39 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
RNA_STRUCT_END;
|
|
|
|
}
|
2009-10-12 12:54:08 +00:00
|
|
|
|
2012-10-31 20:29:32 +00:00
|
|
|
|
|
|
|
/** set all props to their default,
|
|
|
|
* \param do_update Only update un-initialized props.
|
|
|
|
*
|
2018-09-24 17:27:41 +02:00
|
|
|
* \note, there's nothing specific to operators here.
|
2012-10-31 20:29:32 +00:00
|
|
|
* this could be made a general function.
|
|
|
|
*/
|
2013-11-26 06:39:14 +11:00
|
|
|
bool WM_operator_properties_default(PointerRNA *ptr, const bool do_update)
|
2012-10-31 20:29:32 +00:00
|
|
|
{
|
2013-11-26 06:39:14 +11:00
|
|
|
bool changed = false;
|
2013-08-24 10:05:29 +00:00
|
|
|
RNA_STRUCT_BEGIN (ptr, prop)
|
2012-10-31 20:29:32 +00:00
|
|
|
{
|
|
|
|
switch (RNA_property_type(prop)) {
|
|
|
|
case PROP_POINTER:
|
|
|
|
{
|
|
|
|
StructRNA *ptype = RNA_property_pointer_type(ptr, prop);
|
|
|
|
if (ptype != &RNA_Struct) {
|
|
|
|
PointerRNA opptr = RNA_property_pointer_get(ptr, prop);
|
2013-11-26 06:39:14 +11:00
|
|
|
changed |= WM_operator_properties_default(&opptr, do_update);
|
2012-10-31 20:29:32 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
default:
|
2014-04-01 11:34:00 +11:00
|
|
|
if ((do_update == false) || (RNA_property_is_set(ptr, prop) == false)) {
|
2012-10-31 20:29:32 +00:00
|
|
|
if (RNA_property_reset(ptr, prop, -1)) {
|
2013-11-26 06:39:14 +11:00
|
|
|
changed = true;
|
2012-10-31 20:29:32 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
RNA_STRUCT_END;
|
|
|
|
|
2013-11-26 06:39:14 +11:00
|
|
|
return changed;
|
2012-10-31 20:29:32 +00:00
|
|
|
}
|
|
|
|
|
2012-01-11 19:33:14 +00:00
|
|
|
/* remove all props without PROP_SKIP_SAVE */
|
|
|
|
void WM_operator_properties_reset(wmOperator *op)
|
|
|
|
{
|
|
|
|
if (op->ptr->data) {
|
|
|
|
PropertyRNA *iterprop;
|
2012-03-27 01:24:16 +00:00
|
|
|
iterprop = RNA_struct_iterator_property(op->type->srna);
|
2012-01-11 19:33:14 +00:00
|
|
|
|
2013-08-24 10:05:29 +00:00
|
|
|
RNA_PROP_BEGIN (op->ptr, itemptr, iterprop)
|
2012-04-30 16:22:40 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
PropertyRNA *prop = itemptr.data;
|
2012-01-11 19:33:14 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if ((RNA_property_flag(prop) & PROP_SKIP_SAVE) == 0) {
|
2012-01-11 19:33:14 +00:00
|
|
|
const char *identifier = RNA_property_identifier(prop);
|
|
|
|
RNA_struct_idprops_unset(op->ptr, identifier);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
RNA_PROP_END;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-29 16:01:03 +11:00
|
|
|
void WM_operator_properties_clear(PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
IDProperty *properties = ptr->data;
|
|
|
|
|
|
|
|
if (properties) {
|
|
|
|
IDP_ClearProperty(properties);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-01-01 20:44:40 +00:00
|
|
|
void WM_operator_properties_free(PointerRNA *ptr)
|
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
IDProperty *properties = ptr->data;
|
2009-01-01 20:44:40 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (properties) {
|
2009-01-01 20:44:40 +00:00
|
|
|
IDP_FreeProperty(properties);
|
|
|
|
MEM_freeN(properties);
|
2012-03-27 01:24:16 +00:00
|
|
|
ptr->data = NULL; /* just in case */
|
2009-01-01 20:44:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2.5: work on bringing back SpaceTime options
- RMB select, also with SHIFT
- RMB tweak for translate
- SHIFT+D dupli
- BKEY border select/deselect
- AKEY (de)select all
- XKEY delete
- GKEY grab
Added some XXX comments for future todos, especially for when other
spaces come back with time markers.
Also added ED_util for putting in all to-be-cleaned cruft
Context conflict: input methods for Markers can conflict with other
spacetypes. It was solved in pre-2.5 with manually tweaking it all over,
but I would prefer one keymap for all marker stuff. Needs some thinking...
could be solved with a boundbox check for bottom part of 2d window.
Tweak issue: both tweak styles are possible:
- Hold mouse button, move, operator ends on mouse release
- Hold mouse button, move, operator ends on mouse click
Problem is that modally handled operators use fixed keymaps... like ESC,
SPACE, ENTER, or press/release mousebutton for 'assign'. There's a lot
to say for making this all consistant, or become part of 1 general keymap?
Should also be possibe to define 'tweak' defaults for Tablet different
than for mouse...
2008-11-29 15:10:31 +00:00
|
|
|
/* ************ default op callbacks, exported *********** */
|
2007-12-24 18:27:28 +00:00
|
|
|
|
2013-09-16 04:19:48 +00:00
|
|
|
void WM_operator_view3d_unit_defaults(struct bContext *C, struct wmOperator *op)
|
2012-12-09 10:48:18 +00:00
|
|
|
{
|
2013-09-16 04:19:48 +00:00
|
|
|
if (op->flag & OP_IS_INVOKE) {
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
View3D *v3d = CTX_wm_view3d(C);
|
2012-12-09 10:48:18 +00:00
|
|
|
|
2013-09-16 04:19:48 +00:00
|
|
|
const float dia = v3d ? ED_view3d_grid_scale(scene, v3d, NULL) : ED_scene_grid_scale(scene, NULL);
|
2012-12-09 10:48:18 +00:00
|
|
|
|
2013-09-16 04:19:48 +00:00
|
|
|
/* always run, so the values are initialized,
|
|
|
|
* otherwise we may get differ behavior when (dia != 1.0) */
|
|
|
|
RNA_STRUCT_BEGIN (op->ptr, prop)
|
|
|
|
{
|
|
|
|
if (RNA_property_type(prop) == PROP_FLOAT) {
|
|
|
|
PropertySubType pstype = RNA_property_subtype(prop);
|
|
|
|
if (pstype == PROP_DISTANCE) {
|
|
|
|
/* we don't support arrays yet */
|
2014-04-01 11:34:00 +11:00
|
|
|
BLI_assert(RNA_property_array_check(prop) == false);
|
2013-09-16 04:19:48 +00:00
|
|
|
/* initialize */
|
2014-04-01 11:34:00 +11:00
|
|
|
if (!RNA_property_is_set_ex(op->ptr, prop, false)) {
|
2013-09-16 04:19:48 +00:00
|
|
|
const float value = RNA_property_float_get_default(op->ptr, prop) * dia;
|
|
|
|
RNA_property_float_set(op->ptr, prop, value);
|
|
|
|
}
|
2012-12-09 10:48:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-09-16 04:19:48 +00:00
|
|
|
RNA_STRUCT_END;
|
2012-12-09 10:48:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-16 04:04:44 +00:00
|
|
|
int WM_operator_smooth_viewtx_get(const wmOperator *op)
|
|
|
|
{
|
|
|
|
return (op->flag & OP_IS_INVOKE) ? U.smooth_viewtx : 0;
|
|
|
|
}
|
|
|
|
|
2008-12-24 18:06:51 +00:00
|
|
|
/* invoke callback, uses enum property named "type" */
|
2016-05-31 16:30:44 +10:00
|
|
|
int WM_menu_invoke_ex(bContext *C, wmOperator *op, int opcontext)
|
2008-12-17 15:38:40 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
PropertyRNA *prop = op->type->prop;
|
2009-04-22 18:39:44 +00:00
|
|
|
uiPopupMenu *pup;
|
|
|
|
uiLayout *layout;
|
2009-02-01 02:37:12 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
if (prop == NULL) {
|
2018-03-29 20:38:32 +02:00
|
|
|
CLOG_ERROR(WM_LOG_OPERATORS,
|
|
|
|
"'%s' has no enum property set",
|
|
|
|
op->type->idname);
|
2009-02-01 02:37:12 +00:00
|
|
|
}
|
2009-04-19 13:37:59 +00:00
|
|
|
else if (RNA_property_type(prop) != PROP_ENUM) {
|
2018-03-29 20:38:32 +02:00
|
|
|
CLOG_ERROR(WM_LOG_OPERATORS,
|
|
|
|
"'%s', '%s' is not an enum property",
|
|
|
|
op->type->idname, RNA_property_identifier(prop));
|
2009-02-01 02:37:12 +00:00
|
|
|
}
|
2012-01-11 16:48:22 +00:00
|
|
|
else if (RNA_property_is_set(op->ptr, prop)) {
|
2012-03-27 01:24:16 +00:00
|
|
|
const int retval = op->type->exec(C, op);
|
2011-08-25 16:42:42 +00:00
|
|
|
OPERATOR_RETVAL_CHECK(retval);
|
|
|
|
return retval;
|
2009-12-10 23:22:43 +00:00
|
|
|
}
|
2009-02-01 02:37:12 +00:00
|
|
|
else {
|
2014-11-09 21:20:40 +01:00
|
|
|
pup = UI_popup_menu_begin(C, RNA_struct_ui_name(op->type->srna), ICON_NONE);
|
|
|
|
layout = UI_popup_menu_layout(pup);
|
2012-10-26 06:22:54 +00:00
|
|
|
/* set this so the default execution context is the same as submenus */
|
2016-05-31 16:30:44 +10:00
|
|
|
uiLayoutSetOperatorContext(layout, opcontext);
|
|
|
|
uiItemsFullEnumO(layout, op->type->idname, RNA_property_identifier(prop), op->ptr->data, opcontext, 0);
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_popup_menu_end(C, pup);
|
2014-10-28 17:51:06 +01:00
|
|
|
return OPERATOR_INTERFACE;
|
2008-12-24 18:06:51 +00:00
|
|
|
}
|
2009-02-04 11:52:16 +00:00
|
|
|
|
2008-12-24 18:06:51 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2008-12-17 15:38:40 +00:00
|
|
|
}
|
|
|
|
|
2016-05-31 16:30:44 +10:00
|
|
|
int WM_menu_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
|
|
|
{
|
|
|
|
return WM_menu_invoke_ex(C, op, WM_OP_INVOKE_REGION_WIN);
|
|
|
|
}
|
|
|
|
|
2017-03-13 10:43:49 +01:00
|
|
|
struct EnumSearchMenu {
|
|
|
|
wmOperator *op; /* the operator that will be executed when selecting an item */
|
|
|
|
|
|
|
|
bool use_previews;
|
|
|
|
short prv_cols, prv_rows;
|
|
|
|
};
|
2010-01-15 17:23:16 +00:00
|
|
|
|
2010-01-15 22:40:33 +00:00
|
|
|
/* generic enum search invoke popup */
|
2017-03-13 10:43:49 +01:00
|
|
|
static uiBlock *wm_enum_search_menu(bContext *C, ARegion *ar, void *arg)
|
2010-01-15 17:23:16 +00:00
|
|
|
{
|
2017-03-13 10:43:49 +01:00
|
|
|
struct EnumSearchMenu *search_menu = arg;
|
2012-03-27 01:24:16 +00:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
2017-03-13 10:43:49 +01:00
|
|
|
wmOperator *op = search_menu->op;
|
|
|
|
/* template_ID uses 4 * widget_unit for width, we use a bit more, some items may have a suffix to show */
|
|
|
|
const int width = search_menu->use_previews ? 5 * U.widget_unit * search_menu->prv_cols : UI_searchbox_size_x();
|
|
|
|
const int height = search_menu->use_previews ? 5 * U.widget_unit * search_menu->prv_rows : UI_searchbox_size_y();
|
|
|
|
static char search[256] = "";
|
2010-01-15 17:23:16 +00:00
|
|
|
uiBlock *block;
|
|
|
|
uiBut *but;
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
block = UI_block_begin(C, ar, "_popup", UI_EMBOSS);
|
|
|
|
UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_MOVEMOUSE_QUIT | UI_BLOCK_SEARCH_MENU);
|
2018-09-11 10:56:08 +10:00
|
|
|
UI_block_theme_style_set(block, UI_BLOCK_THEME_STYLE_POPUP);
|
2010-01-15 17:23:16 +00:00
|
|
|
|
2017-03-12 18:14:43 +01:00
|
|
|
search[0] = '\0';
|
2017-03-13 10:43:49 +01:00
|
|
|
BLI_assert(search_menu->use_previews || (search_menu->prv_cols == 0 && search_menu->prv_rows == 0));
|
2012-04-13 19:59:29 +00:00
|
|
|
#if 0 /* ok, this isn't so easy... */
|
2014-11-09 21:20:40 +01:00
|
|
|
uiDefBut(block, UI_BTYPE_LABEL, 0, RNA_struct_ui_name(op->type->srna), 10, 10, UI_searchbox_size_x(), UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
|
2012-04-13 19:59:29 +00:00
|
|
|
#endif
|
2013-04-15 15:01:12 +00:00
|
|
|
but = uiDefSearchButO_ptr(block, op->type, op->ptr->data, search, 0, ICON_VIEWZOOM, sizeof(search),
|
2017-03-13 10:43:49 +01:00
|
|
|
10, 10, width, UI_UNIT_Y, search_menu->prv_rows, search_menu->prv_cols, "");
|
2010-01-15 17:23:16 +00:00
|
|
|
|
|
|
|
/* fake button, it holds space for search items */
|
2017-03-13 10:43:49 +01:00
|
|
|
uiDefBut(block, UI_BTYPE_LABEL, 0, "", 10, 10 - UI_searchbox_size_y(), width, height, NULL, 0, 0, 0, 0, NULL);
|
2010-01-15 17:23:16 +00:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_bounds_set_popup(block, 6, 0, -UI_UNIT_Y); /* move it downwards, mouse over button */
|
2017-03-13 10:43:49 +01:00
|
|
|
UI_but_focus_on_enter_event(win, but);
|
2010-01-15 17:23:16 +00:00
|
|
|
|
|
|
|
return block;
|
|
|
|
}
|
|
|
|
|
2017-03-13 10:43:49 +01:00
|
|
|
/**
|
|
|
|
* Similar to #WM_enum_search_invoke, but draws previews. Also, this can't
|
|
|
|
* be used as invoke callback directly since it needs additional info.
|
|
|
|
*/
|
|
|
|
int WM_enum_search_invoke_previews(
|
|
|
|
bContext *C, wmOperator *op, short prv_cols, short prv_rows)
|
|
|
|
{
|
|
|
|
static struct EnumSearchMenu search_menu;
|
|
|
|
|
|
|
|
search_menu.op = op;
|
|
|
|
search_menu.use_previews = true;
|
|
|
|
search_menu.prv_cols = prv_cols;
|
|
|
|
search_menu.prv_rows = prv_rows;
|
|
|
|
|
|
|
|
UI_popup_block_invoke(C, wm_enum_search_menu, &search_menu);
|
|
|
|
|
|
|
|
return OPERATOR_INTERFACE;
|
|
|
|
}
|
2010-01-15 17:23:16 +00:00
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
int WM_enum_search_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
2010-01-15 17:23:16 +00:00
|
|
|
{
|
2017-03-13 10:43:49 +01:00
|
|
|
static struct EnumSearchMenu search_menu;
|
|
|
|
search_menu.op = op;
|
|
|
|
UI_popup_block_invoke(C, wm_enum_search_menu, &search_menu);
|
2014-10-28 17:51:06 +01:00
|
|
|
return OPERATOR_INTERFACE;
|
2010-01-15 17:23:16 +00:00
|
|
|
}
|
|
|
|
|
2009-10-10 12:29:11 +00:00
|
|
|
/* Can't be used as an invoke directly, needs message arg (can be NULL) */
|
2014-02-09 12:28:14 +11:00
|
|
|
int WM_operator_confirm_message_ex(bContext *C, wmOperator *op,
|
|
|
|
const char *title, const int icon,
|
|
|
|
const char *message)
|
2007-12-24 18:27:28 +00:00
|
|
|
{
|
2009-04-22 18:39:44 +00:00
|
|
|
uiPopupMenu *pup;
|
|
|
|
uiLayout *layout;
|
2012-03-27 01:24:16 +00:00
|
|
|
IDProperty *properties = op->ptr->data;
|
2009-12-22 11:59:30 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (properties && properties->len)
|
2012-03-27 01:24:16 +00:00
|
|
|
properties = IDP_CopyProperty(op->ptr->data);
|
2009-12-22 11:59:30 +00:00
|
|
|
else
|
2012-03-27 01:24:16 +00:00
|
|
|
properties = NULL;
|
2009-02-04 11:52:16 +00:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
pup = UI_popup_menu_begin(C, title, icon);
|
|
|
|
layout = UI_popup_menu_layout(pup);
|
2017-10-31 16:58:26 +11:00
|
|
|
uiItemFullO_ptr(layout, op->type, message, ICON_NONE, properties, WM_OP_EXEC_REGION_WIN, 0, NULL);
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_popup_menu_end(C, pup);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2014-10-28 17:51:06 +01:00
|
|
|
return OPERATOR_INTERFACE;
|
2007-12-24 18:27:28 +00:00
|
|
|
}
|
2008-12-17 15:38:40 +00:00
|
|
|
|
2014-02-09 12:28:14 +11:00
|
|
|
int WM_operator_confirm_message(bContext *C, wmOperator *op, const char *message)
|
|
|
|
{
|
|
|
|
return WM_operator_confirm_message_ex(C, op, IFACE_("OK?"), ICON_QUESTION, message);
|
|
|
|
}
|
2009-10-10 12:29:11 +00:00
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
int WM_operator_confirm(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
2009-10-10 12:29:11 +00:00
|
|
|
{
|
|
|
|
return WM_operator_confirm_message(C, op, NULL);
|
|
|
|
}
|
|
|
|
|
2018-11-20 10:06:02 +11:00
|
|
|
int WM_operator_confirm_or_exec(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
|
|
|
{
|
|
|
|
const bool confirm = RNA_boolean_get(op->ptr, "confirm");
|
|
|
|
if (confirm) {
|
|
|
|
return WM_operator_confirm_message(C, op, NULL);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return op->type->exec(C, op);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-09-12 19:54:39 +00:00
|
|
|
/* op->invoke, opens fileselect if path property not set, otherwise executes */
|
2013-03-13 09:03:46 +00:00
|
|
|
int WM_operator_filesel(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
2009-01-26 09:13:15 +00:00
|
|
|
{
|
2012-01-11 16:32:12 +00:00
|
|
|
if (RNA_struct_property_is_set(op->ptr, "filepath")) {
|
2011-12-12 18:52:18 +00:00
|
|
|
return WM_operator_call_notest(C, op); /* call exec direct */
|
2012-10-21 05:46:41 +00:00
|
|
|
}
|
2009-02-16 12:14:04 +00:00
|
|
|
else {
|
|
|
|
WM_event_add_fileselect(C, op);
|
2009-01-26 09:13:15 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-18 15:30:51 +00:00
|
|
|
bool WM_operator_filesel_ensure_ext_imtype(wmOperator *op, const struct ImageFormatData *im_format)
|
2012-04-24 02:01:23 +00:00
|
|
|
{
|
|
|
|
PropertyRNA *prop;
|
|
|
|
char filepath[FILE_MAX];
|
|
|
|
/* dont NULL check prop, this can only run on ops with a 'filepath' */
|
|
|
|
prop = RNA_struct_find_property(op->ptr, "filepath");
|
|
|
|
RNA_property_string_get(op->ptr, prop, filepath);
|
2015-01-24 16:48:23 +11:00
|
|
|
if (BKE_image_path_ensure_ext_from_imformat(filepath, im_format)) {
|
2012-04-24 02:01:23 +00:00
|
|
|
RNA_property_string_set(op->ptr, prop, filepath);
|
|
|
|
/* note, we could check for and update 'filename' here,
|
|
|
|
* but so far nothing needs this. */
|
2014-04-01 11:34:00 +11:00
|
|
|
return true;
|
2012-04-24 02:01:23 +00:00
|
|
|
}
|
2014-04-01 11:34:00 +11:00
|
|
|
return false;
|
2012-04-24 02:01:23 +00:00
|
|
|
}
|
|
|
|
|
2008-12-24 14:52:17 +00:00
|
|
|
/* op->poll */
|
2018-07-02 11:47:00 +02:00
|
|
|
bool WM_operator_winactive(bContext *C)
|
2007-12-24 18:27:28 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
if (CTX_wm_window(C) == NULL) return 0;
|
2007-12-24 18:27:28 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
/* return false, if the UI should be disabled */
|
2013-04-04 02:05:11 +00:00
|
|
|
bool WM_operator_check_ui_enabled(const bContext *C, const char *idname)
|
2011-12-11 19:23:02 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
2011-12-11 19:23:02 +00:00
|
|
|
|
2015-04-18 15:41:12 +02:00
|
|
|
return !((ED_undo_is_valid(C, idname) == false) || WM_jobs_test(wm, scene, WM_JOB_TYPE_ANY));
|
2011-12-11 19:23:02 +00:00
|
|
|
}
|
|
|
|
|
2011-05-23 10:14:07 +00:00
|
|
|
wmOperator *WM_operator_last_redo(const bContext *C)
|
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
2011-05-23 10:14:07 +00:00
|
|
|
wmOperator *op;
|
|
|
|
|
|
|
|
/* only for operators that are registered and did an undo push */
|
2012-03-27 01:24:16 +00:00
|
|
|
for (op = wm->operators.last; op; op = op->prev)
|
2012-03-24 06:24:53 +00:00
|
|
|
if ((op->type->flag & OPTYPE_REGISTER) && (op->type->flag & OPTYPE_UNDO))
|
2011-05-23 10:14:07 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
return op;
|
|
|
|
}
|
|
|
|
|
2018-05-02 17:59:43 +02:00
|
|
|
IDProperty *WM_operator_last_properties_ensure_idprops(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
if (ot->last_properties == NULL) {
|
|
|
|
IDPropertyTemplate val = {0};
|
|
|
|
ot->last_properties = IDP_New(IDP_GROUP, &val, "wmOperatorProperties");
|
|
|
|
}
|
|
|
|
return ot->last_properties;
|
|
|
|
}
|
|
|
|
|
|
|
|
void WM_operator_last_properties_ensure(wmOperatorType *ot, PointerRNA *ptr)
|
|
|
|
{
|
|
|
|
IDProperty *props = WM_operator_last_properties_ensure_idprops(ot);
|
|
|
|
RNA_pointer_create(NULL, ot->srna, props, ptr);
|
|
|
|
}
|
|
|
|
|
2014-11-23 22:48:48 +01:00
|
|
|
/**
|
2014-11-24 09:33:12 +01:00
|
|
|
* Use for drag & drop a path or name with operators invoke() function.
|
2014-11-23 22:48:48 +01:00
|
|
|
*/
|
|
|
|
ID *WM_operator_drop_load_path(struct bContext *C, wmOperator *op, const short idcode)
|
|
|
|
{
|
2018-05-31 16:04:04 +02:00
|
|
|
Main *bmain = CTX_data_main(C);
|
2014-11-23 22:48:48 +01:00
|
|
|
ID *id = NULL;
|
|
|
|
/* check input variables */
|
|
|
|
if (RNA_struct_property_is_set(op->ptr, "filepath")) {
|
|
|
|
const bool is_relative_path = RNA_boolean_get(op->ptr, "relative_path");
|
|
|
|
char path[FILE_MAX];
|
|
|
|
bool exists = false;
|
|
|
|
|
|
|
|
RNA_string_get(op->ptr, "filepath", path);
|
|
|
|
|
|
|
|
errno = 0;
|
|
|
|
|
|
|
|
if (idcode == ID_IM) {
|
2018-06-11 15:40:37 +02:00
|
|
|
id = (ID *)BKE_image_load_exists_ex(bmain, path, &exists);
|
2014-11-23 22:48:48 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
BLI_assert(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!id) {
|
|
|
|
BKE_reportf(op->reports, RPT_ERROR, "Cannot read %s '%s': %s",
|
|
|
|
BKE_idcode_to_name(idcode), path,
|
|
|
|
errno ? strerror(errno) : TIP_("unsupported format"));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (is_relative_path ) {
|
|
|
|
if (exists == false) {
|
|
|
|
if (idcode == ID_IM) {
|
2018-06-05 15:10:33 +02:00
|
|
|
BLI_path_rel(((Image *)id)->name, BKE_main_blendfile_path(bmain));
|
2014-11-23 22:48:48 +01:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
BLI_assert(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (RNA_struct_property_is_set(op->ptr, "name")) {
|
|
|
|
char name[MAX_ID_NAME - 2];
|
|
|
|
RNA_string_get(op->ptr, "name", name);
|
2018-05-31 16:04:04 +02:00
|
|
|
id = BKE_libblock_find_name(bmain, idcode, name);
|
2014-11-23 22:48:48 +01:00
|
|
|
if (!id) {
|
|
|
|
BKE_reportf(op->reports, RPT_ERROR, "%s '%s' not found",
|
|
|
|
BKE_idcode_to_name(idcode), name);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
id_us_plus(id);
|
|
|
|
}
|
|
|
|
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
|
2013-02-19 13:41:58 +00:00
|
|
|
static void wm_block_redo_cb(bContext *C, void *arg_op, int UNUSED(arg_event))
|
2012-11-28 16:42:39 +00:00
|
|
|
{
|
|
|
|
wmOperator *op = arg_op;
|
|
|
|
|
|
|
|
if (op == WM_operator_last_redo(C)) {
|
|
|
|
/* operator was already executed once? undo & repeat */
|
|
|
|
ED_undo_operator_repeat(C, op);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* operator not executed yet, call it */
|
|
|
|
ED_undo_push_op(C, op);
|
|
|
|
wm_operator_register(C, op);
|
|
|
|
|
|
|
|
WM_operator_repeat(C, op);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-02-19 13:37:48 +00:00
|
|
|
static void wm_block_redo_cancel_cb(bContext *C, void *arg_op)
|
|
|
|
{
|
|
|
|
wmOperator *op = arg_op;
|
|
|
|
|
|
|
|
/* if operator never got executed, free it */
|
|
|
|
if (op != WM_operator_last_redo(C))
|
|
|
|
WM_operator_free(op);
|
|
|
|
}
|
|
|
|
|
2009-04-01 14:02:06 +00:00
|
|
|
static uiBlock *wm_block_create_redo(bContext *C, ARegion *ar, void *arg_op)
|
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmOperator *op = arg_op;
|
2009-04-01 14:02:06 +00:00
|
|
|
uiBlock *block;
|
2009-05-19 17:13:33 +00:00
|
|
|
uiLayout *layout;
|
2014-11-09 21:20:40 +01:00
|
|
|
uiStyle *style = UI_style_get();
|
2012-12-14 15:09:59 +00:00
|
|
|
int width = 15 * UI_UNIT_X;
|
2009-11-23 00:56:19 +00:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
block = UI_block_begin(C, ar, __func__, UI_EMBOSS);
|
|
|
|
UI_block_flag_disable(block, UI_BLOCK_LOOP);
|
2018-09-11 10:56:08 +10:00
|
|
|
UI_block_theme_style_set(block, UI_BLOCK_THEME_STYLE_REGULAR);
|
|
|
|
|
2015-06-13 00:39:19 +10:00
|
|
|
/* UI_BLOCK_NUMSELECT for layer buttons */
|
|
|
|
UI_block_flag_enable(block, UI_BLOCK_NUMSELECT | UI_BLOCK_KEEP_OPEN | UI_BLOCK_MOVEMOUSE_QUIT);
|
2010-10-31 14:43:30 +00:00
|
|
|
|
|
|
|
/* if register is not enabled, the operator gets freed on OPERATOR_FINISHED
|
2012-04-22 11:54:53 +00:00
|
|
|
* ui_apply_but_funcs_after calls ED_undo_operator_repeate_cb and crashes */
|
2010-10-31 14:43:30 +00:00
|
|
|
assert(op->type->flag & OPTYPE_REGISTER);
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_func_handle_set(block, wm_block_redo_cb, arg_op);
|
|
|
|
layout = UI_block_layout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, width, UI_UNIT_Y, 0, style);
|
2010-12-15 04:06:19 +00:00
|
|
|
|
2012-11-28 16:42:39 +00:00
|
|
|
if (op == WM_operator_last_redo(C))
|
|
|
|
if (!WM_operator_check_ui_enabled(C, op->type->name))
|
2014-04-01 11:34:00 +11:00
|
|
|
uiLayoutSetEnabled(layout, false);
|
2011-01-12 18:00:23 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (op->type->flag & OPTYPE_MACRO) {
|
2012-03-27 01:24:16 +00:00
|
|
|
for (op = op->macro.first; op; op = op->next) {
|
2018-07-26 13:50:56 +10:00
|
|
|
uiTemplateOperatorPropertyButs(
|
|
|
|
C, layout, op, UI_BUT_LABEL_ALIGN_SPLIT_COLUMN,
|
|
|
|
UI_TEMPLATE_OP_PROPS_SHOW_TITLE);
|
2015-10-12 16:44:07 +02:00
|
|
|
if (op->next)
|
|
|
|
uiItemS(layout);
|
2011-06-09 15:26:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2018-07-26 13:50:56 +10:00
|
|
|
uiTemplateOperatorPropertyButs(
|
|
|
|
C, layout, op, UI_BUT_LABEL_ALIGN_SPLIT_COLUMN,
|
|
|
|
UI_TEMPLATE_OP_PROPS_SHOW_TITLE);
|
2011-06-09 15:26:05 +00:00
|
|
|
}
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_bounds_set_popup(block, 4, 0, 0);
|
2009-04-01 14:02:06 +00:00
|
|
|
|
|
|
|
return block;
|
|
|
|
}
|
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
typedef struct wmOpPopUp {
|
2011-06-24 03:30:50 +00:00
|
|
|
wmOperator *op;
|
|
|
|
int width;
|
|
|
|
int height;
|
|
|
|
int free_op;
|
|
|
|
} wmOpPopUp;
|
|
|
|
|
|
|
|
/* Only invoked by OK button in popups created with wm_block_dialog_create() */
|
2010-03-20 18:03:59 +00:00
|
|
|
static void dialog_exec_cb(bContext *C, void *arg1, void *arg2)
|
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmOpPopUp *data = arg1;
|
|
|
|
uiBlock *block = arg2;
|
2010-03-20 18:03:59 +00:00
|
|
|
|
2017-11-05 14:33:18 +11:00
|
|
|
/* Explicitly set UI_RETURN_OK flag, otherwise the menu might be canceled
|
2016-09-01 16:25:42 +02:00
|
|
|
* in case WM_operator_call_ex exits/reloads the current file (T49199). */
|
|
|
|
UI_popup_menu_retval_set(block, UI_RETURN_OK, true);
|
|
|
|
|
2014-01-29 02:52:06 +11:00
|
|
|
WM_operator_call_ex(C, data->op, true);
|
2011-06-24 03:30:50 +00:00
|
|
|
|
|
|
|
/* let execute handle freeing it */
|
2014-04-01 11:34:00 +11:00
|
|
|
//data->free_op = false;
|
2012-05-27 19:40:36 +00:00
|
|
|
//data->op = NULL;
|
2011-06-24 03:30:50 +00:00
|
|
|
|
|
|
|
/* in this case, wm_operator_ui_popup_cancel wont run */
|
|
|
|
MEM_freeN(data);
|
2010-03-20 18:03:59 +00:00
|
|
|
|
2016-09-01 16:55:01 +02:00
|
|
|
/* get context data *after* WM_operator_call_ex which might have closed the current file and changed context */
|
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
|
|
|
wmWindow *win = CTX_wm_window(C);
|
|
|
|
|
2015-06-08 15:57:42 +10:00
|
|
|
/* check window before 'block->handle' incase the
|
2016-09-01 16:55:01 +02:00
|
|
|
* popup execution closed the window and freed the block. see T44688.
|
|
|
|
*/
|
|
|
|
/* Post 2.78 TODO: Check if this fix and others related to T44688 are still
|
|
|
|
* needed or can be improved now that requesting context data has been corrected
|
|
|
|
* (see above). We're close to release so not a good time for experiments.
|
|
|
|
* -- Julian
|
|
|
|
*/
|
2015-06-08 15:57:42 +10:00
|
|
|
if (BLI_findindex(&wm->windows, win) != -1) {
|
|
|
|
UI_popup_block_close(C, win, block);
|
|
|
|
}
|
2010-03-20 18:03:59 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Dialogs are popups that require user verification (click OK) before exec */
|
2011-06-24 03:30:50 +00:00
|
|
|
static uiBlock *wm_block_dialog_create(bContext *C, ARegion *ar, void *userData)
|
2010-03-20 18:03:59 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmOpPopUp *data = userData;
|
|
|
|
wmOperator *op = data->op;
|
2010-03-20 18:03:59 +00:00
|
|
|
uiBlock *block;
|
|
|
|
uiLayout *layout;
|
2014-11-09 21:20:40 +01:00
|
|
|
uiStyle *style = UI_style_get();
|
2010-03-20 18:03:59 +00:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
block = UI_block_begin(C, ar, __func__, UI_EMBOSS);
|
|
|
|
UI_block_flag_disable(block, UI_BLOCK_LOOP);
|
2018-09-11 10:56:08 +10:00
|
|
|
UI_block_theme_style_set(block, UI_BLOCK_THEME_STYLE_REGULAR);
|
2012-06-29 20:29:13 +00:00
|
|
|
|
2013-02-11 00:49:00 +00:00
|
|
|
/* intentionally don't use 'UI_BLOCK_MOVEMOUSE_QUIT', some dialogues have many items
|
2012-06-29 20:29:13 +00:00
|
|
|
* where quitting by accident is very annoying */
|
2015-08-07 14:39:50 +02:00
|
|
|
UI_block_flag_enable(block, UI_BLOCK_KEEP_OPEN | UI_BLOCK_NUMSELECT);
|
2010-03-20 18:03:59 +00:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
layout = UI_block_layout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, data->width, data->height, 0, style);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2018-07-26 13:50:56 +10:00
|
|
|
uiTemplateOperatorPropertyButs(
|
|
|
|
C, layout, op, UI_BUT_LABEL_ALIGN_SPLIT_COLUMN,
|
|
|
|
UI_TEMPLATE_OP_PROPS_SHOW_TITLE);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2010-12-15 05:42:23 +00:00
|
|
|
/* clear so the OK button is left alone */
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_func_set(block, NULL, NULL, NULL);
|
2010-03-20 18:03:59 +00:00
|
|
|
|
2012-07-18 11:01:23 +00:00
|
|
|
/* new column so as not to interfere with custom layouts [#26436] */
|
2011-03-10 22:22:47 +00:00
|
|
|
{
|
|
|
|
uiBlock *col_block;
|
|
|
|
uiLayout *col;
|
|
|
|
uiBut *btn;
|
|
|
|
|
2014-04-01 11:34:00 +11:00
|
|
|
col = uiLayoutColumn(layout, false);
|
2012-03-27 01:24:16 +00:00
|
|
|
col_block = uiLayoutGetBlock(col);
|
2011-03-10 22:22:47 +00:00
|
|
|
/* Create OK button, the callback of which will execute op */
|
2014-11-09 21:20:40 +01:00
|
|
|
btn = uiDefBut(col_block, UI_BTYPE_BUT, 0, IFACE_("OK"), 0, -30, 0, UI_UNIT_Y, NULL, 0, 0, 0, 0, "");
|
|
|
|
UI_but_func_set(btn, dialog_exec_cb, data, col_block);
|
2011-03-10 22:22:47 +00:00
|
|
|
}
|
2010-03-20 18:03:59 +00:00
|
|
|
|
2010-11-30 18:07:44 +00:00
|
|
|
/* center around the mouse */
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_bounds_set_popup(block, 4, data->width / -2, data->height / 2);
|
2010-03-20 18:03:59 +00:00
|
|
|
|
|
|
|
return block;
|
|
|
|
}
|
2009-12-06 04:35:00 +00:00
|
|
|
|
2011-06-24 03:30:50 +00:00
|
|
|
static uiBlock *wm_operator_ui_create(bContext *C, ARegion *ar, void *userData)
|
2009-12-06 04:35:00 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmOpPopUp *data = userData;
|
|
|
|
wmOperator *op = data->op;
|
2009-12-06 04:35:00 +00:00
|
|
|
uiBlock *block;
|
|
|
|
uiLayout *layout;
|
2014-11-09 21:20:40 +01:00
|
|
|
uiStyle *style = UI_style_get();
|
2009-12-06 04:35:00 +00:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
block = UI_block_begin(C, ar, __func__, UI_EMBOSS);
|
|
|
|
UI_block_flag_disable(block, UI_BLOCK_LOOP);
|
|
|
|
UI_block_flag_enable(block, UI_BLOCK_KEEP_OPEN | UI_BLOCK_MOVEMOUSE_QUIT);
|
2018-09-11 10:56:08 +10:00
|
|
|
UI_block_theme_style_set(block, UI_BLOCK_THEME_STYLE_REGULAR);
|
2009-12-06 04:35:00 +00:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
layout = UI_block_layout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, data->width, data->height, 0, style);
|
2009-12-06 04:35:00 +00:00
|
|
|
|
2010-12-15 05:42:23 +00:00
|
|
|
/* since ui is defined the auto-layout args are not used */
|
2018-07-26 13:50:56 +10:00
|
|
|
uiTemplateOperatorPropertyButs(C, layout, op, UI_BUT_LABEL_ALIGN_COLUMN, 0);
|
2009-12-06 04:35:00 +00:00
|
|
|
|
2016-06-08 15:51:01 +02:00
|
|
|
UI_block_func_set(block, NULL, NULL, NULL);
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_bounds_set_popup(block, 4, 0, 0);
|
2009-12-06 04:35:00 +00:00
|
|
|
|
|
|
|
return block;
|
|
|
|
}
|
|
|
|
|
2013-10-30 23:15:27 +00:00
|
|
|
static void wm_operator_ui_popup_cancel(struct bContext *C, void *userData)
|
2011-06-24 03:30:50 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmOpPopUp *data = userData;
|
2013-10-30 23:15:27 +00:00
|
|
|
wmOperator *op = data->op;
|
|
|
|
|
|
|
|
if (op) {
|
|
|
|
if (op->type->cancel) {
|
|
|
|
op->type->cancel(C, op);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->free_op) {
|
|
|
|
WM_operator_free(op);
|
|
|
|
}
|
2011-06-24 03:30:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
MEM_freeN(data);
|
|
|
|
}
|
|
|
|
|
2011-11-24 13:51:31 +00:00
|
|
|
static void wm_operator_ui_popup_ok(struct bContext *C, void *arg, int retval)
|
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmOpPopUp *data = arg;
|
|
|
|
wmOperator *op = data->op;
|
2011-11-24 13:51:31 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (op && retval > 0)
|
2014-01-29 02:52:06 +11:00
|
|
|
WM_operator_call_ex(C, op, true);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-11-13 14:34:36 +00:00
|
|
|
MEM_freeN(data);
|
2011-11-24 13:51:31 +00:00
|
|
|
}
|
|
|
|
|
2011-06-24 03:30:50 +00:00
|
|
|
int WM_operator_ui_popup(bContext *C, wmOperator *op, int width, int height)
|
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmOpPopUp *data = MEM_callocN(sizeof(wmOpPopUp), "WM_operator_ui_popup");
|
|
|
|
data->op = op;
|
|
|
|
data->width = width;
|
|
|
|
data->height = height;
|
2014-04-01 11:34:00 +11:00
|
|
|
data->free_op = true; /* if this runs and gets registered we may want not to free it */
|
2017-03-30 16:48:18 +03:00
|
|
|
UI_popup_block_ex(C, wm_operator_ui_create, NULL, wm_operator_ui_popup_cancel, data, op);
|
2011-06-24 03:30:50 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
|
2012-11-14 06:13:42 +00:00
|
|
|
/**
|
|
|
|
* For use by #WM_operator_props_popup_call, #WM_operator_props_popup only.
|
|
|
|
*
|
2015-02-07 04:33:48 +11:00
|
|
|
* \note operator menu needs undo flag enabled, for redo callback */
|
2013-10-09 14:35:25 +00:00
|
|
|
static int wm_operator_props_popup_ex(bContext *C, wmOperator *op,
|
|
|
|
const bool do_call, const bool do_redo)
|
2009-04-01 14:02:06 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
if ((op->type->flag & OPTYPE_REGISTER) == 0) {
|
2012-02-19 06:00:20 +00:00
|
|
|
BKE_reportf(op->reports, RPT_ERROR,
|
2012-10-13 15:44:50 +00:00
|
|
|
"Operator '%s' does not have register enabled, incorrect invoke function", op->type->idname);
|
2010-10-31 14:43:30 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2012-11-14 06:13:42 +00:00
|
|
|
|
2014-05-01 05:27:43 +10:00
|
|
|
if (do_redo) {
|
|
|
|
if ((op->type->flag & OPTYPE_UNDO) == 0) {
|
|
|
|
BKE_reportf(op->reports, RPT_ERROR,
|
|
|
|
"Operator '%s' does not have undo enabled, incorrect invoke function", op->type->idname);
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-27 16:02:15 +00:00
|
|
|
/* if we don't have global undo, we can't do undo push for automatic redo,
|
|
|
|
* so we require manual OK clicking in this popup */
|
2013-10-09 14:35:25 +00:00
|
|
|
if (!do_redo || !(U.uiflag & USER_GLOBALUNDO))
|
2018-11-01 12:23:33 +01:00
|
|
|
return WM_operator_props_dialog_popup(C, op, 300, 20);
|
2012-11-27 16:02:15 +00:00
|
|
|
|
2017-03-30 16:48:18 +03:00
|
|
|
UI_popup_block_ex(C, wm_block_create_redo, NULL, wm_block_redo_cancel_cb, op, op);
|
2009-04-01 14:02:06 +00:00
|
|
|
|
2012-11-28 16:42:39 +00:00
|
|
|
if (do_call)
|
|
|
|
wm_block_redo_cb(C, op, 0);
|
2012-11-14 06:13:42 +00:00
|
|
|
|
2011-01-19 14:19:20 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
2009-04-01 14:02:06 +00:00
|
|
|
}
|
|
|
|
|
2015-06-01 14:56:07 +10:00
|
|
|
/**
|
|
|
|
* Same as #WM_operator_props_popup but don't use operator redo.
|
|
|
|
* just wraps #WM_operator_props_dialog_popup.
|
2013-10-09 14:35:25 +00:00
|
|
|
*/
|
|
|
|
int WM_operator_props_popup_confirm(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
|
|
|
{
|
|
|
|
return wm_operator_props_popup_ex(C, op, false, false);
|
|
|
|
}
|
|
|
|
|
2015-06-01 14:56:07 +10:00
|
|
|
/**
|
|
|
|
* Same as #WM_operator_props_popup but call the operator first,
|
2012-11-18 01:22:31 +00:00
|
|
|
* This way - the button values correspond to the result of the operator.
|
2015-06-01 14:56:07 +10:00
|
|
|
* Without this, first access to a button will make the result jump, see T32452.
|
|
|
|
*/
|
2013-03-13 09:03:46 +00:00
|
|
|
int WM_operator_props_popup_call(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
2012-11-14 06:13:42 +00:00
|
|
|
{
|
2013-10-09 14:35:25 +00:00
|
|
|
return wm_operator_props_popup_ex(C, op, true, true);
|
2012-11-14 06:13:42 +00:00
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
int WM_operator_props_popup(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
2012-11-14 06:13:42 +00:00
|
|
|
{
|
2013-10-09 14:35:25 +00:00
|
|
|
return wm_operator_props_popup_ex(C, op, false, true);
|
2012-11-14 06:13:42 +00:00
|
|
|
}
|
|
|
|
|
2010-03-20 18:03:59 +00:00
|
|
|
int WM_operator_props_dialog_popup(bContext *C, wmOperator *op, int width, int height)
|
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmOpPopUp *data = MEM_callocN(sizeof(wmOpPopUp), "WM_operator_props_dialog_popup");
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
data->op = op;
|
2018-11-01 12:23:33 +01:00
|
|
|
data->width = width * U.dpi_fac;
|
|
|
|
data->height = height * U.dpi_fac;
|
2014-04-01 11:34:00 +11:00
|
|
|
data->free_op = true; /* if this runs and gets registered we may want not to free it */
|
2010-03-20 18:03:59 +00:00
|
|
|
|
|
|
|
/* op is not executed until popup OK but is clicked */
|
2017-03-30 16:48:18 +03:00
|
|
|
UI_popup_block_ex(C, wm_block_dialog_create, wm_operator_ui_popup_ok, wm_operator_ui_popup_cancel, data, op);
|
2010-03-20 18:03:59 +00:00
|
|
|
|
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
|
2009-04-01 14:02:06 +00:00
|
|
|
int WM_operator_redo_popup(bContext *C, wmOperator *op)
|
|
|
|
{
|
2011-04-01 12:51:04 +00:00
|
|
|
/* CTX_wm_reports(C) because operator is on stack, not active in event system */
|
2012-03-27 01:24:16 +00:00
|
|
|
if ((op->type->flag & OPTYPE_REGISTER) == 0) {
|
2012-10-13 15:44:50 +00:00
|
|
|
BKE_reportf(CTX_wm_reports(C), RPT_ERROR,
|
|
|
|
"Operator redo '%s' does not have register enabled, incorrect invoke function", op->type->idname);
|
2011-04-01 12:51:04 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2012-03-27 01:24:16 +00:00
|
|
|
if (op->type->poll && op->type->poll(C) == 0) {
|
2012-10-13 15:44:50 +00:00
|
|
|
BKE_reportf(CTX_wm_reports(C), RPT_ERROR, "Operator redo '%s': wrong context", op->type->idname);
|
2010-10-31 14:43:30 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_popup_block_invoke(C, wm_block_create_redo, op);
|
2009-04-01 14:02:06 +00:00
|
|
|
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
|
2009-05-22 15:02:32 +00:00
|
|
|
/* ***************** Debug menu ************************* */
|
|
|
|
|
|
|
|
static int wm_debug_menu_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
2012-08-08 18:21:54 +00:00
|
|
|
G.debug_value = RNA_int_get(op->ptr, "debug_value");
|
2009-05-22 15:02:32 +00:00
|
|
|
ED_screen_refresh(CTX_wm_manager(C), CTX_wm_window(C));
|
|
|
|
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
2010-12-15 06:12:16 +00:00
|
|
|
|
2012-10-21 05:46:41 +00:00
|
|
|
return OPERATOR_FINISHED;
|
2009-05-22 15:02:32 +00:00
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int wm_debug_menu_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
|
2009-05-22 15:02:32 +00:00
|
|
|
{
|
2012-08-08 18:21:54 +00:00
|
|
|
RNA_int_set(op->ptr, "debug_value", G.debug_value);
|
2018-11-01 12:23:33 +01:00
|
|
|
return WM_operator_props_dialog_popup(C, op, 180, 20);
|
2009-05-22 15:02:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void WM_OT_debug_menu(wmOperatorType *ot)
|
|
|
|
{
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Debug Menu";
|
|
|
|
ot->idname = "WM_OT_debug_menu";
|
|
|
|
ot->description = "Open a popup to set the debug level";
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = wm_debug_menu_invoke;
|
|
|
|
ot->exec = wm_debug_menu_exec;
|
|
|
|
ot->poll = WM_operator_winactive;
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-10-11 23:46:12 +00:00
|
|
|
RNA_def_int(ot->srna, "debug_value", 0, SHRT_MIN, SHRT_MAX, "Debug Value", "", -10000, 10000);
|
2009-05-22 15:02:32 +00:00
|
|
|
}
|
|
|
|
|
2012-11-12 21:44:48 +00:00
|
|
|
/* ***************** Operator defaults ************************* */
|
|
|
|
static int wm_operator_defaults_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
PointerRNA ptr = CTX_data_pointer_get_type(C, "active_operator", &RNA_Operator);
|
|
|
|
|
|
|
|
if (!ptr.data) {
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "No operator in context");
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
|
|
|
|
|
|
|
WM_operator_properties_reset((wmOperator *)ptr.data);
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* used by operator preset menu. pre-2.65 this was a 'Reset' button */
|
|
|
|
static void WM_OT_operator_defaults(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
ot->name = "Restore Defaults";
|
|
|
|
ot->idname = "WM_OT_operator_defaults";
|
|
|
|
ot->description = "Set the active operator to its default values";
|
|
|
|
|
|
|
|
ot->exec = wm_operator_defaults_exec;
|
|
|
|
|
|
|
|
ot->flag = OPTYPE_INTERNAL;
|
|
|
|
}
|
2009-11-23 13:58:55 +00:00
|
|
|
|
|
|
|
/* ***************** Splash Screen ************************* */
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static void wm_block_splash_close(bContext *C, void *arg_block, void *UNUSED(arg))
|
2009-11-23 13:58:55 +00:00
|
|
|
{
|
2015-06-08 15:57:42 +10:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
|
|
|
UI_popup_block_close(C, win, arg_block);
|
2009-11-23 13:58:55 +00:00
|
|
|
}
|
|
|
|
|
* Interaction Presets
This adds a new presets menu in the splash screen and the Input section of
User Preferences to choose a preset interaction style, consisting of key configurations
and also other user preferences such as select mouse button, view rotation style, etc.
Currently, just 'Blender' and 'Maya' presets are included, hopefully we can have more
presets contributed (and maintained!) by the community.
It's best to keep these presets minimal to avoid too many key conflicts. In the Maya one
I changed the view manipulation key/mouse combos and also the transform
manipulator keys, not much more than that.
To save an interaction preset, open the user preferences Input section, and press the
[ + ] button next to the presets menu. It will save out a .py file containing any edited key
maps and navigation preferences to the presets/interaction folder in your scripts folder.
---
Part of this commit changes the way that key maps are exported/displayed in
preferences - now partial key configs are allowed. Previously it would export/import the
entire key configuration, regardless of whether individual key maps were edited or not
(which would make them more susceptible to conflicts in unexpected areas).
(note, in blender terminology, a key map is a category of key items, such as
'Object Mode' or 'View 2d'.)
Now, the export and the UI display work in a similar way to how key maps are
processed internally - Locally edited key maps (after pressing the 'Edit' button) are
processed first, falling back to other key maps in the current key config, and then falling
back to the default key config. So it's possible for a key config to only include a few
key maps, and the rest just gets pulled from the default key config. The preferences
UI display works like this too behind the scenes in deciding what to show users,
however using it is just like it was before, the complexity is hidden.
2010-04-14 06:27:50 +00:00
|
|
|
static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *arg_unused);
|
|
|
|
|
2015-06-09 21:54:47 +10:00
|
|
|
static void wm_block_splash_refreshmenu(bContext *C, void *UNUSED(arg_block), void *UNUSED(arg))
|
* Interaction Presets
This adds a new presets menu in the splash screen and the Input section of
User Preferences to choose a preset interaction style, consisting of key configurations
and also other user preferences such as select mouse button, view rotation style, etc.
Currently, just 'Blender' and 'Maya' presets are included, hopefully we can have more
presets contributed (and maintained!) by the community.
It's best to keep these presets minimal to avoid too many key conflicts. In the Maya one
I changed the view manipulation key/mouse combos and also the transform
manipulator keys, not much more than that.
To save an interaction preset, open the user preferences Input section, and press the
[ + ] button next to the presets menu. It will save out a .py file containing any edited key
maps and navigation preferences to the presets/interaction folder in your scripts folder.
---
Part of this commit changes the way that key maps are exported/displayed in
preferences - now partial key configs are allowed. Previously it would export/import the
entire key configuration, regardless of whether individual key maps were edited or not
(which would make them more susceptible to conflicts in unexpected areas).
(note, in blender terminology, a key map is a category of key items, such as
'Object Mode' or 'View 2d'.)
Now, the export and the UI display work in a similar way to how key maps are
processed internally - Locally edited key maps (after pressing the 'Edit' button) are
processed first, falling back to other key maps in the current key config, and then falling
back to the default key config. So it's possible for a key config to only include a few
key maps, and the rest just gets pulled from the default key config. The preferences
UI display works like this too behind the scenes in deciding what to show users,
however using it is just like it was before, the complexity is hidden.
2010-04-14 06:27:50 +00:00
|
|
|
{
|
2015-06-09 21:54:47 +10:00
|
|
|
ARegion *ar_menu = CTX_wm_menu(C);
|
|
|
|
ED_region_tag_refresh_ui(ar_menu);
|
* Interaction Presets
This adds a new presets menu in the splash screen and the Input section of
User Preferences to choose a preset interaction style, consisting of key configurations
and also other user preferences such as select mouse button, view rotation style, etc.
Currently, just 'Blender' and 'Maya' presets are included, hopefully we can have more
presets contributed (and maintained!) by the community.
It's best to keep these presets minimal to avoid too many key conflicts. In the Maya one
I changed the view manipulation key/mouse combos and also the transform
manipulator keys, not much more than that.
To save an interaction preset, open the user preferences Input section, and press the
[ + ] button next to the presets menu. It will save out a .py file containing any edited key
maps and navigation preferences to the presets/interaction folder in your scripts folder.
---
Part of this commit changes the way that key maps are exported/displayed in
preferences - now partial key configs are allowed. Previously it would export/import the
entire key configuration, regardless of whether individual key maps were edited or not
(which would make them more susceptible to conflicts in unexpected areas).
(note, in blender terminology, a key map is a category of key items, such as
'Object Mode' or 'View 2d'.)
Now, the export and the UI display work in a similar way to how key maps are
processed internally - Locally edited key maps (after pressing the 'Edit' button) are
processed first, falling back to other key maps in the current key config, and then falling
back to the default key config. So it's possible for a key config to only include a few
key maps, and the rest just gets pulled from the default key config. The preferences
UI display works like this too behind the scenes in deciding what to show users,
however using it is just like it was before, the complexity is hidden.
2010-04-14 06:27:50 +00:00
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(arg))
|
2009-11-23 13:58:55 +00:00
|
|
|
{
|
|
|
|
uiBlock *block;
|
|
|
|
uiBut *but;
|
2014-11-09 21:20:40 +01:00
|
|
|
uiStyle *style = UI_style_get();
|
2011-09-30 07:47:45 +00:00
|
|
|
|
|
|
|
#ifndef WITH_HEADLESS
|
|
|
|
extern char datatoc_splash_png[];
|
|
|
|
extern int datatoc_splash_png_size;
|
|
|
|
|
2014-02-17 21:52:20 +01:00
|
|
|
extern char datatoc_splash_2x_png[];
|
|
|
|
extern int datatoc_splash_2x_png_size;
|
|
|
|
ImBuf *ibuf;
|
2011-09-30 07:47:45 +00:00
|
|
|
#else
|
2012-03-27 01:24:16 +00:00
|
|
|
ImBuf *ibuf = NULL;
|
2011-09-30 07:47:45 +00:00
|
|
|
#endif
|
|
|
|
|
2011-08-22 16:54:26 +00:00
|
|
|
#ifdef WITH_BUILDINFO
|
2013-11-04 13:21:39 +00:00
|
|
|
int label_delta = 0;
|
2013-11-15 17:11:59 +06:00
|
|
|
int hash_width, date_width;
|
|
|
|
char date_buf[128] = "\0";
|
2013-11-04 13:21:39 +00:00
|
|
|
char hash_buf[128] = "\0";
|
2013-11-15 17:11:59 +06:00
|
|
|
extern unsigned long build_commit_timestamp;
|
|
|
|
extern char build_hash[], build_commit_date[], build_commit_time[], build_branch[];
|
2013-11-04 13:21:39 +00:00
|
|
|
|
2013-11-15 17:11:59 +06:00
|
|
|
/* Builds made from tag only shows tag sha */
|
|
|
|
BLI_snprintf(hash_buf, sizeof(hash_buf), "Hash: %s", build_hash);
|
|
|
|
BLI_snprintf(date_buf, sizeof(date_buf), "Date: %s %s", build_commit_date, build_commit_time);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
BLF_size(style->widgetlabel.uifont_id, style->widgetlabel.points, U.pixelsize * U.dpi);
|
2014-01-01 16:04:52 +01:00
|
|
|
hash_width = (int)BLF_width(style->widgetlabel.uifont_id, hash_buf, sizeof(hash_buf)) + U.widget_unit;
|
|
|
|
date_width = (int)BLF_width(style->widgetlabel.uifont_id, date_buf, sizeof(date_buf)) + U.widget_unit;
|
2012-10-20 20:20:02 +00:00
|
|
|
#endif /* WITH_BUILDINFO */
|
2010-01-08 06:05:42 +00:00
|
|
|
|
2014-02-18 20:34:55 +01:00
|
|
|
#ifndef WITH_HEADLESS
|
2018-09-21 10:43:36 +02:00
|
|
|
if (U.dpi_fac > 1.0) {
|
2014-02-18 20:34:55 +01:00
|
|
|
ibuf = IMB_ibImageFromMemory((unsigned char *)datatoc_splash_2x_png,
|
|
|
|
datatoc_splash_2x_png_size, IB_rect, NULL, "<splash screen>");
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ibuf = IMB_ibImageFromMemory((unsigned char *)datatoc_splash_png,
|
|
|
|
datatoc_splash_png_size, IB_rect, NULL, "<splash screen>");
|
|
|
|
}
|
2017-03-25 09:29:51 +11:00
|
|
|
|
|
|
|
/* overwrite splash with template image */
|
|
|
|
if (U.app_template[0] != '\0') {
|
|
|
|
ImBuf *ibuf_template = NULL;
|
|
|
|
char splash_filepath[FILE_MAX];
|
|
|
|
char template_directory[FILE_MAX];
|
|
|
|
|
|
|
|
if (BKE_appdir_app_template_id_search(
|
|
|
|
U.app_template,
|
|
|
|
template_directory, sizeof(template_directory)))
|
|
|
|
{
|
|
|
|
BLI_join_dirfile(
|
|
|
|
splash_filepath, sizeof(splash_filepath), template_directory,
|
|
|
|
(U.pixelsize == 2) ? "splash_2x.png" : "splash.png");
|
|
|
|
ibuf_template = IMB_loadiffname(splash_filepath, IB_rect, NULL);
|
|
|
|
if (ibuf_template) {
|
2017-03-28 17:07:11 +11:00
|
|
|
const int x_expect = ibuf->x;
|
2018-11-28 16:36:48 +01:00
|
|
|
const int y_expect = 250 * (int)U.dpi_fac;
|
2017-03-25 09:29:51 +11:00
|
|
|
/* don't cover the header text */
|
|
|
|
if (ibuf_template->x == x_expect && ibuf_template->y == y_expect) {
|
|
|
|
memcpy(ibuf->rect, ibuf_template->rect, ibuf_template->x * ibuf_template->y * sizeof(char[4]));
|
|
|
|
}
|
|
|
|
else {
|
2018-03-29 20:38:32 +02:00
|
|
|
CLOG_ERROR(WM_LOG_OPERATORS,
|
|
|
|
"Splash expected %dx%d found %dx%d, ignoring: %s\n",
|
|
|
|
x_expect, y_expect, ibuf_template->x, ibuf_template->y, splash_filepath);
|
2017-03-25 09:29:51 +11:00
|
|
|
}
|
|
|
|
IMB_freeImBuf(ibuf_template);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-02-18 20:34:55 +01:00
|
|
|
#endif
|
|
|
|
|
2018-09-18 17:44:14 +02:00
|
|
|
block = UI_block_begin(C, ar, "splash", UI_EMBOSS);
|
2012-10-25 02:57:55 +00:00
|
|
|
|
|
|
|
/* note on UI_BLOCK_NO_WIN_CLIP, the window size is not always synchronized
|
|
|
|
* with the OS when the splash shows, window clipping in this case gives
|
|
|
|
* ugly results and clipping the splash isn't useful anyway, just disable it [#32938] */
|
2015-06-09 21:54:47 +10:00
|
|
|
UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_KEEP_OPEN | UI_BLOCK_NO_WIN_CLIP);
|
2018-09-11 10:56:08 +10:00
|
|
|
UI_block_theme_style_set(block, UI_BLOCK_THEME_STYLE_POPUP);
|
2014-02-17 21:52:20 +01:00
|
|
|
|
2018-11-28 16:36:48 +01:00
|
|
|
but = uiDefBut(block, UI_BTYPE_IMAGE, 0, "", 0, 0.5f * U.widget_unit, U.dpi_fac * 501, U.dpi_fac * 250, ibuf, 0.0, 0.0, 0, 0, ""); /* button owns the imbuf now */
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_but_func_set(but, wm_block_splash_close, block, NULL);
|
|
|
|
UI_block_func_set(block, wm_block_splash_refreshmenu, block, NULL);
|
2014-03-03 17:29:03 +11:00
|
|
|
|
|
|
|
/* label for 'a' bugfix releases, or 'Release Candidate 1'...
|
2018-09-02 18:28:27 +10:00
|
|
|
* avoids recreating splash for version updates */
|
2018-11-28 16:36:48 +01:00
|
|
|
const char *version_suffix = NULL;
|
|
|
|
|
2018-07-02 19:25:29 +02:00
|
|
|
if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "alpha")) {
|
2018-11-28 16:36:48 +01:00
|
|
|
version_suffix = " Alpha";
|
2018-07-02 19:25:29 +02:00
|
|
|
}
|
|
|
|
else if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "beta")) {
|
2018-11-28 16:36:48 +01:00
|
|
|
version_suffix = " Beta";
|
2018-07-02 19:25:29 +02:00
|
|
|
}
|
|
|
|
else if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "rc")) {
|
2018-11-28 16:36:48 +01:00
|
|
|
version_suffix = " Release Candidate";
|
2014-06-13 20:19:02 +06:00
|
|
|
}
|
|
|
|
else if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "release")) {
|
|
|
|
version_suffix = STRINGIFY(BLENDER_VERSION_CHAR);
|
|
|
|
}
|
2018-11-28 16:36:48 +01:00
|
|
|
|
|
|
|
char *version = BLI_sprintfN("Version %d.%d%s", BLENDER_VERSION / 100, BLENDER_VERSION % 100, version_suffix);
|
|
|
|
|
|
|
|
if (version != NULL && version[0]) {
|
2014-03-03 17:29:03 +11:00
|
|
|
/* placed after the version number in the image,
|
|
|
|
* placing y is tricky to match baseline */
|
|
|
|
/* hack to have text draw 'text_sel' */
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_emboss_set(block, UI_EMBOSS_NONE);
|
2018-11-28 16:36:48 +01:00
|
|
|
int x = 202 * U.dpi_fac;
|
|
|
|
int y = 130 * U.dpi_fac;
|
|
|
|
int w = 240 * U.dpi_fac;
|
|
|
|
|
|
|
|
|
|
|
|
but = uiDefBut(block, UI_BTYPE_LABEL, 0, version, x, y, w, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
|
2014-03-03 17:29:03 +11:00
|
|
|
/* XXX, set internal flag - UI_SELECT */
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_but_flag_enable(but, 1);
|
|
|
|
UI_block_emboss_set(block, UI_EMBOSS);
|
2014-03-03 17:29:03 +11:00
|
|
|
}
|
|
|
|
|
2018-11-28 16:36:48 +01:00
|
|
|
MEM_freeN(version);
|
|
|
|
|
2013-11-04 13:21:39 +00:00
|
|
|
#ifdef WITH_BUILDINFO
|
2013-11-15 17:11:59 +06:00
|
|
|
if (build_commit_timestamp != 0) {
|
2017-09-23 15:28:45 +02:00
|
|
|
but = uiDefBut(
|
|
|
|
block, UI_BTYPE_LABEL, 0, date_buf,
|
2018-11-28 16:36:48 +01:00
|
|
|
U.dpi_fac * 502 - date_width, U.dpi_fac * 237,
|
2017-09-23 15:28:45 +02:00
|
|
|
date_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
|
|
|
|
/* XXX, set internal flag - UI_SELECT */
|
2018-11-28 16:36:48 +01:00
|
|
|
UI_but_flag_enable(but, 0);
|
2013-11-04 13:21:39 +00:00
|
|
|
label_delta = 12;
|
|
|
|
}
|
2017-09-23 15:28:45 +02:00
|
|
|
but = uiDefBut(
|
|
|
|
block, UI_BTYPE_LABEL, 0, hash_buf,
|
2018-11-28 16:36:48 +01:00
|
|
|
U.dpi_fac * 502 - hash_width, U.dpi_fac * (237 - label_delta),
|
2017-09-23 15:28:45 +02:00
|
|
|
hash_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
|
|
|
|
/* XXX, set internal flag - UI_SELECT */
|
2018-11-28 16:36:48 +01:00
|
|
|
UI_but_flag_enable(but, 0);
|
2013-11-04 13:21:39 +00:00
|
|
|
|
2014-03-07 18:26:34 +06:00
|
|
|
if (!STREQ(build_branch, "master")) {
|
2013-11-04 13:21:39 +00:00
|
|
|
char branch_buf[128] = "\0";
|
|
|
|
int branch_width;
|
|
|
|
BLI_snprintf(branch_buf, sizeof(branch_buf), "Branch: %s", build_branch);
|
2014-01-01 16:04:52 +01:00
|
|
|
branch_width = (int)BLF_width(style->widgetlabel.uifont_id, branch_buf, sizeof(branch_buf)) + U.widget_unit;
|
2017-09-23 15:28:45 +02:00
|
|
|
but = uiDefBut(
|
|
|
|
block, UI_BTYPE_LABEL, 0, branch_buf,
|
2018-11-28 16:36:48 +01:00
|
|
|
U.dpi_fac * 502 - branch_width, U.dpi_fac * (225 - label_delta),
|
2017-09-23 15:28:45 +02:00
|
|
|
branch_width, UI_UNIT_Y, NULL, 0, 0, 0, 0, NULL);
|
|
|
|
/* XXX, set internal flag - UI_SELECT */
|
2018-11-28 16:36:48 +01:00
|
|
|
UI_but_flag_enable(but, 0);
|
2013-11-04 13:21:39 +00:00
|
|
|
}
|
2012-10-20 20:20:02 +00:00
|
|
|
#endif /* WITH_BUILDINFO */
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2018-09-18 17:44:14 +02:00
|
|
|
uiLayout *layout = UI_block_layout(
|
2018-11-28 16:36:48 +01:00
|
|
|
block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, U.dpi_fac * 40, 0,
|
|
|
|
U.dpi_fac * 450, U.dpi_fac * 110, 0, style);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2018-09-18 17:44:14 +02:00
|
|
|
MenuType *mt = WM_menutype_find("WM_MT_splash", true);
|
* Interaction Presets
This adds a new presets menu in the splash screen and the Input section of
User Preferences to choose a preset interaction style, consisting of key configurations
and also other user preferences such as select mouse button, view rotation style, etc.
Currently, just 'Blender' and 'Maya' presets are included, hopefully we can have more
presets contributed (and maintained!) by the community.
It's best to keep these presets minimal to avoid too many key conflicts. In the Maya one
I changed the view manipulation key/mouse combos and also the transform
manipulator keys, not much more than that.
To save an interaction preset, open the user preferences Input section, and press the
[ + ] button next to the presets menu. It will save out a .py file containing any edited key
maps and navigation preferences to the presets/interaction folder in your scripts folder.
---
Part of this commit changes the way that key maps are exported/displayed in
preferences - now partial key configs are allowed. Previously it would export/import the
entire key configuration, regardless of whether individual key maps were edited or not
(which would make them more susceptible to conflicts in unexpected areas).
(note, in blender terminology, a key map is a category of key items, such as
'Object Mode' or 'View 2d'.)
Now, the export and the UI display work in a similar way to how key maps are
processed internally - Locally edited key maps (after pressing the 'Edit' button) are
processed first, falling back to other key maps in the current key config, and then falling
back to the default key config. So it's possible for a key config to only include a few
key maps, and the rest just gets pulled from the default key config. The preferences
UI display works like this too behind the scenes in deciding what to show users,
however using it is just like it was before, the complexity is hidden.
2010-04-14 06:27:50 +00:00
|
|
|
if (mt) {
|
2017-11-02 18:19:11 +11:00
|
|
|
UI_menutype_draw(C, mt, layout);
|
2015-02-01 04:15:34 +11:00
|
|
|
}
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_bounds_set_centered(block, 0);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2009-11-23 13:58:55 +00:00
|
|
|
return block;
|
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int wm_splash_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *UNUSED(event))
|
2009-11-23 13:58:55 +00:00
|
|
|
{
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_popup_block_invoke(C, wm_block_create_splash, NULL);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2009-11-23 13:58:55 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void WM_OT_splash(wmOperatorType *ot)
|
|
|
|
{
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Splash Screen";
|
|
|
|
ot->idname = "WM_OT_splash";
|
2013-11-25 22:23:36 +01:00
|
|
|
ot->description = "Open the splash screen with release info";
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = wm_splash_invoke;
|
|
|
|
ot->poll = WM_operator_winactive;
|
2009-11-23 13:58:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2009-06-03 18:31:37 +00:00
|
|
|
/* ***************** Search menu ************************* */
|
2016-03-02 13:57:16 +11:00
|
|
|
|
|
|
|
struct SearchPopupInit_Data {
|
|
|
|
int size[2];
|
|
|
|
};
|
|
|
|
|
|
|
|
static uiBlock *wm_block_search_menu(bContext *C, ARegion *ar, void *userdata)
|
2009-06-03 18:31:37 +00:00
|
|
|
{
|
2016-03-02 13:57:16 +11:00
|
|
|
const struct SearchPopupInit_Data *init_data = userdata;
|
2012-03-27 01:24:16 +00:00
|
|
|
static char search[256] = "";
|
2009-06-03 18:31:37 +00:00
|
|
|
wmEvent event;
|
2012-03-27 01:24:16 +00:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
2009-06-03 18:31:37 +00:00
|
|
|
uiBlock *block;
|
|
|
|
uiBut *but;
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
block = UI_block_begin(C, ar, "_popup", UI_EMBOSS);
|
|
|
|
UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_MOVEMOUSE_QUIT | UI_BLOCK_SEARCH_MENU);
|
2018-09-11 10:56:08 +10:00
|
|
|
UI_block_theme_style_set(block, UI_BLOCK_THEME_STYLE_POPUP);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2016-03-02 13:57:16 +11:00
|
|
|
but = uiDefSearchBut(block, search, 0, ICON_VIEWZOOM, sizeof(search), 10, 10, init_data->size[0], UI_UNIT_Y, 0, 0, "");
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_but_func_operator_search(but);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2009-06-05 16:11:18 +00:00
|
|
|
/* fake button, it holds space for search items */
|
2016-03-02 13:57:16 +11:00
|
|
|
uiDefBut(block, UI_BTYPE_LABEL, 0, "", 10, 10 - init_data->size[1],
|
|
|
|
init_data->size[0], init_data->size[1], NULL, 0, 0, 0, 0, NULL);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
UI_block_bounds_set_popup(block, 6, 0, -UI_UNIT_Y); /* move it downwards, mouse over button */
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2013-07-29 08:29:04 +00:00
|
|
|
wm_event_init_from_window(win, &event);
|
2012-03-27 01:24:16 +00:00
|
|
|
event.type = EVT_BUT_OPEN;
|
|
|
|
event.val = KM_PRESS;
|
|
|
|
event.customdata = but;
|
2014-04-01 11:34:00 +11:00
|
|
|
event.customdatafree = false;
|
2009-06-03 18:31:37 +00:00
|
|
|
wm_event_add(win, &event);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2009-06-03 18:31:37 +00:00
|
|
|
return block;
|
|
|
|
}
|
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static int wm_search_menu_exec(bContext *UNUSED(C), wmOperator *UNUSED(op))
|
2009-06-03 18:31:37 +00:00
|
|
|
{
|
2012-05-06 15:03:31 +00:00
|
|
|
return OPERATOR_FINISHED;
|
2009-06-03 18:31:37 +00:00
|
|
|
}
|
|
|
|
|
2018-12-10 17:33:36 +11:00
|
|
|
static int wm_search_menu_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
|
2009-06-03 18:31:37 +00:00
|
|
|
{
|
2018-12-10 17:33:36 +11:00
|
|
|
/* Exception for launching via spacebar */
|
|
|
|
if (event->type == SPACEKEY) {
|
|
|
|
bool ok = true;
|
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
|
|
|
if (sa) {
|
|
|
|
if (sa->spacetype == SPACE_CONSOLE) {
|
|
|
|
/* So we can use the shortcut in the console. */
|
|
|
|
ok = false;
|
|
|
|
}
|
|
|
|
else if (sa->spacetype == SPACE_TEXT) {
|
|
|
|
/* So we can use the spacebar in the text editor. */
|
|
|
|
ok = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
Object *editob = CTX_data_edit_object(C);
|
|
|
|
if (editob && editob->type == OB_FONT) {
|
|
|
|
/* So we can use the spacebar for entering text. */
|
|
|
|
ok = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!ok) {
|
|
|
|
return OPERATOR_PASS_THROUGH;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2016-03-02 13:57:16 +11:00
|
|
|
struct SearchPopupInit_Data data = {
|
|
|
|
.size = {
|
2016-03-02 14:05:49 +11:00
|
|
|
UI_searchbox_size_x() * 2,
|
2016-03-02 13:57:16 +11:00
|
|
|
UI_searchbox_size_y(),
|
|
|
|
},
|
|
|
|
};
|
|
|
|
|
|
|
|
UI_popup_block_invoke(C, wm_block_search_menu, &data);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2014-10-28 17:51:06 +01:00
|
|
|
return OPERATOR_INTERFACE;
|
2009-06-03 18:31:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void WM_OT_search_menu(wmOperatorType *ot)
|
|
|
|
{
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Search Menu";
|
|
|
|
ot->idname = "WM_OT_search_menu";
|
2012-05-06 15:03:31 +00:00
|
|
|
ot->description = "Pop-up a search menu over all available operators in current context";
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = wm_search_menu_invoke;
|
|
|
|
ot->exec = wm_search_menu_exec;
|
2018-12-10 17:33:36 +11:00
|
|
|
ot->poll = WM_operator_winactive;
|
2009-06-03 18:31:37 +00:00
|
|
|
}
|
|
|
|
|
2010-02-11 21:17:05 +00:00
|
|
|
static int wm_call_menu_exec(bContext *C, wmOperator *op)
|
2009-10-06 13:04:31 +00:00
|
|
|
{
|
|
|
|
char idname[BKE_ST_MAXNAME];
|
|
|
|
RNA_string_get(op->ptr, "name", idname);
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
return UI_popup_menu_invoke(C, idname, op->reports);
|
2009-10-06 13:04:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void WM_OT_call_menu(wmOperatorType *ot)
|
|
|
|
{
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Call Menu";
|
|
|
|
ot->idname = "WM_OT_call_menu";
|
2013-02-28 15:31:20 +00:00
|
|
|
ot->description = "Call (draw) a pre-defined menu";
|
2009-10-06 13:04:31 +00:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = wm_call_menu_exec;
|
|
|
|
ot->poll = WM_operator_winactive;
|
2009-10-06 13:04:31 +00:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->flag = OPTYPE_INTERNAL;
|
2011-06-06 11:56:54 +00:00
|
|
|
|
2014-01-16 21:43:22 +11:00
|
|
|
RNA_def_string(ot->srna, "name", NULL, BKE_ST_MAXNAME, "Name", "Name of the menu");
|
2009-10-06 13:04:31 +00:00
|
|
|
}
|
2009-05-22 15:02:32 +00:00
|
|
|
|
Pie Menus C code backend.
This commit merges the code in the pie-menu branch.
As per decisions taken the last few days, there are no pie menus
included and there will be an official add-on including overrides of
some keys with pie menus. However, people will now be able to use the
new code in python.
Full Documentation is in http://wiki.blender.org/index.php/Dev:Ref/
Thanks:
Campbell Barton, Dalai Felinto and Ton Roosendaal for the code review
and design comments
Jonathan Williamson, Pawel Lyczkowski, Pablo Vazquez among others for
suggestions during the development.
Special Thanks to Sean Olson, for his support, suggestions, testing and
merciless bugging so that I would finish the pie menu code. Without him
we wouldn't be here. Also to the rest of the developers of the original
python add-on, Patrick Moore and Dan Eicher and finally to Matt Ebb, who
did the research and first implementation and whose code I used to get
started.
2014-08-11 10:39:59 +02:00
|
|
|
static int wm_call_pie_menu_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
|
|
|
{
|
|
|
|
char idname[BKE_ST_MAXNAME];
|
|
|
|
RNA_string_get(op->ptr, "name", idname);
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
return UI_pie_menu_invoke(C, idname, event);
|
Pie Menus C code backend.
This commit merges the code in the pie-menu branch.
As per decisions taken the last few days, there are no pie menus
included and there will be an official add-on including overrides of
some keys with pie menus. However, people will now be able to use the
new code in python.
Full Documentation is in http://wiki.blender.org/index.php/Dev:Ref/
Thanks:
Campbell Barton, Dalai Felinto and Ton Roosendaal for the code review
and design comments
Jonathan Williamson, Pawel Lyczkowski, Pablo Vazquez among others for
suggestions during the development.
Special Thanks to Sean Olson, for his support, suggestions, testing and
merciless bugging so that I would finish the pie menu code. Without him
we wouldn't be here. Also to the rest of the developers of the original
python add-on, Patrick Moore and Dan Eicher and finally to Matt Ebb, who
did the research and first implementation and whose code I used to get
started.
2014-08-11 10:39:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int wm_call_pie_menu_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
char idname[BKE_ST_MAXNAME];
|
|
|
|
RNA_string_get(op->ptr, "name", idname);
|
|
|
|
|
2014-11-09 21:20:40 +01:00
|
|
|
return UI_pie_menu_invoke(C, idname, CTX_wm_window(C)->eventstate);
|
Pie Menus C code backend.
This commit merges the code in the pie-menu branch.
As per decisions taken the last few days, there are no pie menus
included and there will be an official add-on including overrides of
some keys with pie menus. However, people will now be able to use the
new code in python.
Full Documentation is in http://wiki.blender.org/index.php/Dev:Ref/
Thanks:
Campbell Barton, Dalai Felinto and Ton Roosendaal for the code review
and design comments
Jonathan Williamson, Pawel Lyczkowski, Pablo Vazquez among others for
suggestions during the development.
Special Thanks to Sean Olson, for his support, suggestions, testing and
merciless bugging so that I would finish the pie menu code. Without him
we wouldn't be here. Also to the rest of the developers of the original
python add-on, Patrick Moore and Dan Eicher and finally to Matt Ebb, who
did the research and first implementation and whose code I used to get
started.
2014-08-11 10:39:59 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void WM_OT_call_menu_pie(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
ot->name = "Call Pie Menu";
|
|
|
|
ot->idname = "WM_OT_call_menu_pie";
|
|
|
|
ot->description = "Call (draw) a pre-defined pie menu";
|
|
|
|
|
|
|
|
ot->invoke = wm_call_pie_menu_invoke;
|
|
|
|
ot->exec = wm_call_pie_menu_exec;
|
|
|
|
ot->poll = WM_operator_winactive;
|
|
|
|
|
|
|
|
ot->flag = OPTYPE_INTERNAL;
|
|
|
|
|
|
|
|
RNA_def_string(ot->srna, "name", NULL, BKE_ST_MAXNAME, "Name", "Name of the pie menu");
|
|
|
|
}
|
|
|
|
|
2018-05-23 19:46:40 +02:00
|
|
|
static int wm_call_panel_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
char idname[BKE_ST_MAXNAME];
|
|
|
|
RNA_string_get(op->ptr, "name", idname);
|
2018-06-06 09:43:03 +02:00
|
|
|
const bool keep_open = RNA_boolean_get(op->ptr, "keep_open");
|
2018-05-23 19:46:40 +02:00
|
|
|
|
2018-07-13 19:13:44 +02:00
|
|
|
return UI_popover_panel_invoke(C, idname, keep_open, op->reports);
|
2018-05-23 19:46:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void WM_OT_call_panel(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
ot->name = "Call Panel";
|
|
|
|
ot->idname = "WM_OT_call_panel";
|
|
|
|
ot->description = "Call (draw) a pre-defined panel";
|
|
|
|
|
|
|
|
ot->exec = wm_call_panel_exec;
|
|
|
|
ot->poll = WM_operator_winactive;
|
|
|
|
|
|
|
|
ot->flag = OPTYPE_INTERNAL;
|
|
|
|
|
2018-06-06 09:24:24 +02:00
|
|
|
PropertyRNA *prop;
|
|
|
|
|
|
|
|
prop = RNA_def_string(ot->srna, "name", NULL, BKE_ST_MAXNAME, "Name", "Name of the menu");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
|
|
|
prop = RNA_def_boolean(ot->srna, "keep_open", true, "Keep Open", "");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2018-05-23 19:46:40 +02:00
|
|
|
}
|
|
|
|
|
2007-12-24 18:27:28 +00:00
|
|
|
/* ************ window / screen operator definitions ************** */
|
|
|
|
|
2010-01-27 09:16:28 +00:00
|
|
|
/* this poll functions is needed in place of WM_operator_winactive
|
|
|
|
* while it crashes on full screen */
|
2018-07-02 11:47:00 +02:00
|
|
|
static bool wm_operator_winactive_normal(bContext *C)
|
2010-01-27 09:16:28 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
bScreen *screen;
|
2010-01-27 09:16:28 +00:00
|
|
|
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
if (win == NULL)
|
|
|
|
return 0;
|
|
|
|
if (!((screen = WM_window_get_active_screen(win)) && (screen->state == SCREENNORMAL)))
|
2010-03-22 09:30:00 +00:00
|
|
|
return 0;
|
2010-01-27 09:16:28 +00:00
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-10-20 15:41:13 +11:00
|
|
|
/* included for script-access */
|
|
|
|
static void WM_OT_window_close(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
ot->name = "Close Window";
|
|
|
|
ot->idname = "WM_OT_window_close";
|
2018-07-03 15:34:26 +02:00
|
|
|
ot->description = "Close the current window";
|
2015-10-20 15:41:13 +11:00
|
|
|
|
|
|
|
ot->exec = wm_window_close_exec;
|
|
|
|
ot->poll = WM_operator_winactive;
|
|
|
|
}
|
|
|
|
|
2017-03-13 10:43:49 +01:00
|
|
|
static void WM_OT_window_new(wmOperatorType *ot)
|
2007-12-24 18:27:28 +00:00
|
|
|
{
|
2017-03-13 10:43:49 +01:00
|
|
|
ot->name = "New Window";
|
|
|
|
ot->idname = "WM_OT_window_new";
|
2018-07-03 15:34:26 +02:00
|
|
|
ot->description = "Create a new window";
|
2017-03-13 10:43:49 +01:00
|
|
|
|
|
|
|
ot->exec = wm_window_new_exec;
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = wm_operator_winactive_normal;
|
2007-12-24 18:27:28 +00:00
|
|
|
}
|
|
|
|
|
2018-07-03 15:34:26 +02:00
|
|
|
static void WM_OT_window_new_main(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
ot->name = "New Main Window";
|
|
|
|
ot->idname = "WM_OT_window_new_main";
|
|
|
|
ot->description = "Create a new main window with its own workspace and scene selection";
|
|
|
|
|
|
|
|
ot->exec = wm_window_new_main_exec;
|
|
|
|
ot->poll = wm_operator_winactive_normal;
|
|
|
|
}
|
|
|
|
|
2008-01-01 09:07:02 +00:00
|
|
|
static void WM_OT_window_fullscreen_toggle(wmOperatorType *ot)
|
|
|
|
{
|
2014-10-14 15:05:44 -03:00
|
|
|
ot->name = "Toggle Window Fullscreen";
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "WM_OT_window_fullscreen_toggle";
|
|
|
|
ot->description = "Toggle the current window fullscreen";
|
2008-01-01 09:07:02 +00:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = wm_window_fullscreen_toggle_exec;
|
|
|
|
ot->poll = WM_operator_winactive;
|
2008-01-01 09:07:02 +00:00
|
|
|
}
|
|
|
|
|
2018-03-22 23:09:19 +01:00
|
|
|
static int wm_exit_blender_exec(bContext *C, wmOperator *UNUSED(op))
|
2009-01-31 13:30:56 +00:00
|
|
|
{
|
2018-03-23 02:00:14 +01:00
|
|
|
wm_quit_with_optional_confirmation_prompt(C, CTX_wm_window(C));
|
2009-01-31 13:30:56 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2018-03-23 17:31:33 +01:00
|
|
|
static int wm_exit_blender_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
|
|
|
{
|
|
|
|
if (U.uiflag & USER_QUIT_PROMPT) {
|
|
|
|
return wm_exit_blender_exec(C, op);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return WM_operator_confirm(C, op, event);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-11 22:05:45 +00:00
|
|
|
static void WM_OT_quit_blender(wmOperatorType *ot)
|
2008-01-15 18:54:38 +00:00
|
|
|
{
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Quit Blender";
|
|
|
|
ot->idname = "WM_OT_quit_blender";
|
|
|
|
ot->description = "Quit Blender";
|
2008-01-15 18:54:38 +00:00
|
|
|
|
2018-03-23 17:31:33 +01:00
|
|
|
ot->invoke = wm_exit_blender_invoke;
|
2013-07-28 17:06:31 +00:00
|
|
|
ot->exec = wm_exit_blender_exec;
|
2008-01-15 18:54:38 +00:00
|
|
|
}
|
|
|
|
|
2010-10-18 20:41:52 +00:00
|
|
|
/* *********************** */
|
|
|
|
|
2011-05-09 08:01:48 +00:00
|
|
|
#if defined(WIN32)
|
|
|
|
|
2013-07-28 17:06:31 +00:00
|
|
|
static int wm_console_toggle_exec(bContext *UNUSED(C), wmOperator *UNUSED(op))
|
2010-10-18 20:41:52 +00:00
|
|
|
{
|
2011-05-02 08:07:24 +00:00
|
|
|
GHOST_toggleConsole(2);
|
2010-10-18 20:41:52 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2011-04-06 12:30:07 +00:00
|
|
|
static void WM_OT_console_toggle(wmOperatorType *ot)
|
2010-10-18 20:41:52 +00:00
|
|
|
{
|
2013-01-02 16:56:36 +00:00
|
|
|
/* XXX Have to mark these for xgettext, as under linux they do not exists... */
|
2015-08-16 17:32:01 +10:00
|
|
|
ot->name = CTX_N_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Toggle System Console");
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->idname = "WM_OT_console_toggle";
|
Fixed another bunch of i18n bugs (thx to Leon Cheung for spotting them), among which:
* Drag'n'drop translation in Outliner
* "Execute" button in file window
* "Labels" of spacing elements, in multi-column enums
* A glitch with nodes "Value to RGB", they where called "ColorRamp" in node_type_base() call. This is not definitive, though, as it appears that UI node names are determined by this call, while it should be by "defines" in rna_nodetrre_types.h, I guess... Anyway, not good to have such things in two different places!
Also moved default context name under BLF_translation.h, much better to have those all in one place, accessible from whole Blender code!
2012-04-14 15:06:41 +00:00
|
|
|
ot->description = N_("Toggle System Console");
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2013-07-28 17:06:31 +00:00
|
|
|
ot->exec = wm_console_toggle_exec;
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->poll = WM_operator_winactive;
|
2010-10-18 20:41:52 +00:00
|
|
|
}
|
|
|
|
|
2011-05-09 08:01:48 +00:00
|
|
|
#endif
|
|
|
|
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
/* ************ default paint cursors, draw always around cursor *********** */
|
|
|
|
/*
|
2012-03-09 18:28:30 +00:00
|
|
|
* - returns handler to free
|
|
|
|
* - poll(bContext): returns 1 if draw should happen
|
|
|
|
* - draw(bContext): drawing callback for paint cursor
|
|
|
|
*/
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
|
2018-10-25 15:18:24 +11:00
|
|
|
wmPaintCursor *WM_paint_cursor_activate(
|
2018-10-25 16:06:47 +11:00
|
|
|
wmWindowManager *wm,
|
|
|
|
short space_type, short region_type,
|
|
|
|
bool (*poll)(bContext *C),
|
2018-07-02 11:47:00 +02:00
|
|
|
wmPaintCursorDraw draw, void *customdata)
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmPaintCursor *pc = MEM_callocN(sizeof(wmPaintCursor), "paint cursor");
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
BLI_addtail(&wm->paintcursors, pc);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2009-01-24 16:59:55 +00:00
|
|
|
pc->customdata = customdata;
|
2012-03-27 01:24:16 +00:00
|
|
|
pc->poll = poll;
|
|
|
|
pc->draw = draw;
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2018-10-25 16:06:47 +11:00
|
|
|
pc->space_type = space_type;
|
|
|
|
pc->region_type = region_type;
|
|
|
|
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
return pc;
|
|
|
|
}
|
|
|
|
|
2018-10-25 15:18:24 +11:00
|
|
|
bool WM_paint_cursor_end(wmWindowManager *wm, wmPaintCursor *handle)
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
{
|
|
|
|
wmPaintCursor *pc;
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
for (pc = wm->paintcursors.first; pc; pc = pc->next) {
|
2012-03-24 06:24:53 +00:00
|
|
|
if (pc == (wmPaintCursor *)handle) {
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
BLI_remlink(&wm->paintcursors, pc);
|
|
|
|
MEM_freeN(pc);
|
2018-10-25 15:18:24 +11:00
|
|
|
return true;
|
2.5
Vertex Paint back!
Added WM level "paint cursor" system, which manages a custom painting
cursor for tools or modes.
- Activate it with WM_paint_cursor_activate(). That function wants two
callbacks, a poll(C) to check whether there's a cursor in given context
and ARegion, and a draw(C, x, y) which gets called when appropriate.
- While paintcursor is active, the WM handles necessary redrawing events
for all regions, also to nicely clear the cursor on region exit.
- WM_paint_cursor_activate returns a handle, which you have to use to
end the paint cursor. This handle also means you can register as many
custom cursors as you want.
At the moment, vertex paint mode registers only a mousemove handler,
all other events are still normally handled. This is stuff for the
future todo.
2009-01-09 13:55:45 +00:00
|
|
|
}
|
|
|
|
}
|
2018-10-25 15:18:24 +11:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2009-01-24 16:59:55 +00:00
|
|
|
/* *********************** radial control ****************** */
|
|
|
|
|
2016-10-12 20:15:38 +02:00
|
|
|
#define WM_RADIAL_CONTROL_DISPLAY_SIZE (200 * UI_DPI_FAC)
|
|
|
|
#define WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE (35 * UI_DPI_FAC)
|
2014-03-24 22:50:02 +02:00
|
|
|
#define WM_RADIAL_CONTROL_DISPLAY_WIDTH (WM_RADIAL_CONTROL_DISPLAY_SIZE - WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE)
|
2015-05-14 14:01:33 +02:00
|
|
|
#define WM_RADIAL_MAX_STR 10
|
2009-01-24 22:58:22 +00:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
typedef struct {
|
|
|
|
PropertyType type;
|
|
|
|
PropertySubType subtype;
|
|
|
|
PointerRNA ptr, col_ptr, fill_col_ptr, rot_ptr, zoom_ptr, image_id_ptr;
|
2016-02-10 01:48:02 +11:00
|
|
|
PointerRNA fill_col_override_ptr, fill_col_override_test_ptr;
|
2011-05-12 01:57:47 +00:00
|
|
|
PropertyRNA *prop, *col_prop, *fill_col_prop, *rot_prop, *zoom_prop;
|
2016-02-10 01:48:02 +11:00
|
|
|
PropertyRNA *fill_col_override_prop, *fill_col_override_test_prop;
|
2011-05-12 01:57:47 +00:00
|
|
|
StructRNA *image_id_srna;
|
|
|
|
float initial_value, current_value, min_value, max_value;
|
2009-01-24 16:59:55 +00:00
|
|
|
int initial_mouse[2];
|
2014-08-14 11:39:54 +02:00
|
|
|
int slow_mouse[2];
|
|
|
|
bool slow_mode;
|
2014-08-27 17:47:37 +02:00
|
|
|
Dial *dial;
|
2011-05-12 01:57:47 +00:00
|
|
|
unsigned int gltex;
|
|
|
|
ListBase orig_paintcursors;
|
2013-09-05 14:02:59 +00:00
|
|
|
bool use_secondary_tex;
|
2009-01-24 16:59:55 +00:00
|
|
|
void *cursor;
|
2014-11-17 16:12:07 +01:00
|
|
|
NumInput num_input;
|
2011-05-12 01:57:47 +00:00
|
|
|
} RadialControl;
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2014-11-17 15:44:19 +01:00
|
|
|
static void radial_control_update_header(wmOperator *op, bContext *C)
|
|
|
|
{
|
2014-11-17 16:12:07 +01:00
|
|
|
RadialControl *rc = op->customdata;
|
2016-05-14 10:00:52 +02:00
|
|
|
char msg[UI_MAX_DRAW_STR];
|
2018-06-28 12:06:00 +02:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
2014-11-17 16:12:07 +01:00
|
|
|
Scene *scene = CTX_data_scene(C);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2018-06-26 17:19:25 +02:00
|
|
|
if (hasNumInput(&rc->num_input)) {
|
|
|
|
char num_str[NUM_STR_REP_LEN];
|
|
|
|
outputNumInput(&rc->num_input, num_str, &scene->unit);
|
|
|
|
BLI_snprintf(msg, sizeof(msg), "%s: %s", RNA_property_ui_name(rc->prop), num_str);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
const char *ui_name = RNA_property_ui_name(rc->prop);
|
|
|
|
switch (rc->subtype) {
|
|
|
|
case PROP_NONE:
|
|
|
|
case PROP_DISTANCE:
|
|
|
|
BLI_snprintf(msg, sizeof(msg), "%s: %0.4f", ui_name, rc->current_value);
|
|
|
|
break;
|
|
|
|
case PROP_PIXEL:
|
|
|
|
BLI_snprintf(msg, sizeof(msg), "%s: %d", ui_name, (int)rc->current_value); /* XXX: round to nearest? */
|
|
|
|
break;
|
|
|
|
case PROP_PERCENTAGE:
|
|
|
|
BLI_snprintf(msg, sizeof(msg), "%s: %3.1f%%", ui_name, rc->current_value);
|
|
|
|
break;
|
|
|
|
case PROP_FACTOR:
|
|
|
|
BLI_snprintf(msg, sizeof(msg), "%s: %1.3f", ui_name, rc->current_value);
|
|
|
|
break;
|
|
|
|
case PROP_ANGLE:
|
|
|
|
BLI_snprintf(msg, sizeof(msg), "%s: %3.2f", ui_name, RAD2DEGF(rc->current_value));
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
BLI_snprintf(msg, sizeof(msg), "%s", ui_name); /* XXX: No value? */
|
|
|
|
break;
|
2016-03-24 00:55:37 +13:00
|
|
|
}
|
2014-11-17 16:12:07 +01:00
|
|
|
}
|
2018-06-26 17:19:25 +02:00
|
|
|
|
2018-06-28 12:06:00 +02:00
|
|
|
ED_area_status_text(sa, msg);
|
2014-11-17 15:44:19 +01:00
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static void radial_control_set_initial_mouse(RadialControl *rc, const wmEvent *event)
|
2009-01-24 16:59:55 +00:00
|
|
|
{
|
2011-05-12 01:57:47 +00:00
|
|
|
float d[2] = {0, 0};
|
|
|
|
float zoom[2] = {1, 1};
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
rc->initial_mouse[0] = event->x;
|
|
|
|
rc->initial_mouse[1] = event->y;
|
|
|
|
|
|
|
|
switch (rc->subtype) {
|
2013-02-12 10:33:04 +00:00
|
|
|
case PROP_NONE:
|
2012-03-27 01:24:16 +00:00
|
|
|
case PROP_DISTANCE:
|
2013-12-12 20:07:16 +02:00
|
|
|
case PROP_PIXEL:
|
2016-07-12 01:15:54 +10:00
|
|
|
d[0] = rc->initial_value;
|
2012-03-27 01:24:16 +00:00
|
|
|
break;
|
2015-05-14 14:01:33 +02:00
|
|
|
case PROP_PERCENTAGE:
|
2015-05-14 14:16:28 +02:00
|
|
|
d[0] = (rc->initial_value) / 100.0f * WM_RADIAL_CONTROL_DISPLAY_WIDTH + WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE;
|
2015-05-14 14:01:33 +02:00
|
|
|
break;
|
2012-03-27 01:24:16 +00:00
|
|
|
case PROP_FACTOR:
|
2014-03-24 22:50:02 +02:00
|
|
|
d[0] = (1 - rc->initial_value) * WM_RADIAL_CONTROL_DISPLAY_WIDTH + WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE;
|
2012-03-27 01:24:16 +00:00
|
|
|
break;
|
|
|
|
case PROP_ANGLE:
|
2014-09-17 14:11:37 +10:00
|
|
|
d[0] = WM_RADIAL_CONTROL_DISPLAY_SIZE * cosf(rc->initial_value);
|
|
|
|
d[1] = WM_RADIAL_CONTROL_DISPLAY_SIZE * sinf(rc->initial_value);
|
2012-03-27 01:24:16 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
2009-01-24 22:58:22 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (rc->zoom_prop) {
|
2011-05-12 01:57:47 +00:00
|
|
|
RNA_property_float_get_array(&rc->zoom_ptr, rc->zoom_prop, zoom);
|
|
|
|
d[0] *= zoom[0];
|
|
|
|
d[1] *= zoom[1];
|
|
|
|
}
|
2009-01-24 22:58:22 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
rc->initial_mouse[0] -= d[0];
|
|
|
|
rc->initial_mouse[1] -= d[1];
|
2011-05-12 01:57:47 +00:00
|
|
|
}
|
2010-07-14 14:11:03 +00:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
static void radial_control_set_tex(RadialControl *rc)
|
|
|
|
{
|
|
|
|
ImBuf *ibuf;
|
2009-01-24 22:58:22 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
switch (RNA_type_to_ID_code(rc->image_id_ptr.type)) {
|
|
|
|
case ID_BR:
|
2013-09-05 14:02:59 +00:00
|
|
|
if ((ibuf = BKE_brush_gen_radial_control_imbuf(rc->image_id_ptr.data, rc->use_secondary_tex))) {
|
2012-03-27 01:24:16 +00:00
|
|
|
glGenTextures(1, &rc->gltex);
|
|
|
|
glBindTexture(GL_TEXTURE_2D, rc->gltex);
|
2016-11-08 10:51:42 -05:00
|
|
|
glTexImage2D(GL_TEXTURE_2D, 0, GL_R8, ibuf->x, ibuf->y, 0,
|
|
|
|
GL_RED, GL_FLOAT, ibuf->rect_float);
|
2018-03-24 20:27:39 +01:00
|
|
|
glBindTexture(GL_TEXTURE_2D, 0);
|
2012-03-27 01:24:16 +00:00
|
|
|
MEM_freeN(ibuf->rect_float);
|
|
|
|
MEM_freeN(ibuf);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2010-07-14 14:11:03 +00:00
|
|
|
}
|
2011-05-12 01:57:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void radial_control_paint_tex(RadialControl *rc, float radius, float alpha)
|
|
|
|
{
|
|
|
|
float col[3] = {0, 0, 0};
|
|
|
|
float rot;
|
|
|
|
|
|
|
|
/* set fill color */
|
2016-02-10 01:48:02 +11:00
|
|
|
if (rc->fill_col_prop) {
|
|
|
|
PointerRNA *fill_ptr;
|
|
|
|
PropertyRNA *fill_prop;
|
|
|
|
|
|
|
|
if (rc->fill_col_override_prop &&
|
|
|
|
RNA_property_boolean_get(&rc->fill_col_override_test_ptr, rc->fill_col_override_test_prop))
|
|
|
|
{
|
|
|
|
fill_ptr = &rc->fill_col_override_ptr;
|
|
|
|
fill_prop = rc->fill_col_override_prop;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
fill_ptr = &rc->fill_col_ptr;
|
|
|
|
fill_prop = rc->fill_col_prop;
|
|
|
|
}
|
|
|
|
|
|
|
|
RNA_property_float_get_array(fill_ptr, fill_prop, col);
|
|
|
|
}
|
2018-06-07 16:45:10 +02:00
|
|
|
|
2018-07-18 00:12:21 +02:00
|
|
|
GPUVertFormat *format = immVertexFormat();
|
|
|
|
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
|
2010-07-14 14:11:03 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (rc->gltex) {
|
2016-11-08 10:51:42 -05:00
|
|
|
|
2018-07-18 00:12:21 +02:00
|
|
|
uint texCoord = GPU_vertformat_attr_add(format, "texCoord", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
|
2016-11-08 10:51:42 -05:00
|
|
|
|
2018-03-24 20:27:39 +01:00
|
|
|
glActiveTexture(GL_TEXTURE0);
|
2011-05-12 01:57:47 +00:00
|
|
|
glBindTexture(GL_TEXTURE_2D, rc->gltex);
|
2009-01-24 22:58:22 +00:00
|
|
|
|
2016-11-08 10:51:42 -05:00
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
|
|
|
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
|
|
|
|
|
|
|
GLint swizzleMask[] = {GL_ZERO, GL_ZERO, GL_ZERO, GL_RED};
|
|
|
|
glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_RGBA, swizzleMask);
|
|
|
|
|
|
|
|
immBindBuiltinProgram(GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR);
|
|
|
|
|
2017-04-16 12:25:42 -04:00
|
|
|
immUniformColor3fvAlpha(col, alpha);
|
2018-03-24 20:27:39 +01:00
|
|
|
immUniform1i("image", 0);
|
2009-01-24 22:58:22 +00:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* set up rotation if available */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (rc->rot_prop) {
|
2011-05-12 01:57:47 +00:00
|
|
|
rot = RNA_property_float_get(&rc->rot_ptr, rc->rot_prop);
|
2018-07-15 15:27:15 +02:00
|
|
|
GPU_matrix_push();
|
|
|
|
GPU_matrix_rotate_2d(RAD2DEGF(rot));
|
2011-05-12 01:57:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* draw textured quad */
|
2018-07-18 00:12:21 +02:00
|
|
|
immBegin(GPU_PRIM_TRI_FAN, 4);
|
2016-11-08 10:51:42 -05:00
|
|
|
|
2018-10-09 11:01:50 +11:00
|
|
|
immAttr2f(texCoord, 0, 0);
|
2016-11-08 10:51:42 -05:00
|
|
|
immVertex2f(pos, -radius, -radius);
|
|
|
|
|
2018-10-09 11:01:50 +11:00
|
|
|
immAttr2f(texCoord, 1, 0);
|
2016-11-08 10:51:42 -05:00
|
|
|
immVertex2f(pos, radius, -radius);
|
2018-06-07 16:45:10 +02:00
|
|
|
|
2018-10-09 11:01:50 +11:00
|
|
|
immAttr2f(texCoord, 1, 1);
|
2016-11-08 10:51:42 -05:00
|
|
|
immVertex2f(pos, radius, radius);
|
2018-06-07 16:45:10 +02:00
|
|
|
|
2018-10-09 11:01:50 +11:00
|
|
|
immAttr2f(texCoord, 0, 1);
|
2016-11-08 10:51:42 -05:00
|
|
|
immVertex2f(pos, -radius, radius);
|
|
|
|
|
|
|
|
immEnd();
|
2011-05-12 01:57:47 +00:00
|
|
|
|
|
|
|
/* undo rotation */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (rc->rot_prop)
|
2018-07-15 15:27:15 +02:00
|
|
|
GPU_matrix_pop();
|
2009-01-24 22:58:22 +00:00
|
|
|
}
|
2011-05-12 01:57:47 +00:00
|
|
|
else {
|
|
|
|
/* flat color if no texture available */
|
2016-11-08 10:51:42 -05:00
|
|
|
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
|
|
|
|
immUniformColor3fvAlpha(col, alpha);
|
2017-09-14 00:39:28 +10:00
|
|
|
imm_draw_circle_fill_2d(pos, 0.0f, 0.0f, radius, 40);
|
2011-05-12 01:57:47 +00:00
|
|
|
}
|
2018-06-07 16:45:10 +02:00
|
|
|
|
2016-11-08 10:51:42 -05:00
|
|
|
immUnbindProgram();
|
2011-05-12 01:57:47 +00:00
|
|
|
}
|
|
|
|
|
2018-04-30 19:47:33 +02:00
|
|
|
static void radial_control_paint_cursor(bContext *UNUSED(C), int x, int y, void *customdata)
|
2011-05-12 01:57:47 +00:00
|
|
|
{
|
|
|
|
RadialControl *rc = customdata;
|
2014-11-09 21:20:40 +01:00
|
|
|
uiStyle *style = UI_style_get();
|
2014-03-24 22:50:02 +02:00
|
|
|
const uiFontStyle *fstyle = &style->widget;
|
|
|
|
const int fontid = fstyle->uifont_id;
|
|
|
|
short fstyle_points = fstyle->points;
|
|
|
|
char str[WM_RADIAL_MAX_STR];
|
|
|
|
short strdrawlen = 0;
|
|
|
|
float strwidth, strheight;
|
|
|
|
float r1 = 0.0f, r2 = 0.0f, rmin = 0.0, tex_radius, alpha;
|
2018-06-07 16:43:52 +02:00
|
|
|
float zoom[2], col[3] = {1, 1, 1};
|
2009-01-24 22:58:22 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
switch (rc->subtype) {
|
2013-02-12 10:33:04 +00:00
|
|
|
case PROP_NONE:
|
2012-03-27 01:24:16 +00:00
|
|
|
case PROP_DISTANCE:
|
2013-12-12 20:07:16 +02:00
|
|
|
case PROP_PIXEL:
|
2016-07-12 01:15:54 +10:00
|
|
|
r1 = rc->current_value;
|
|
|
|
r2 = rc->initial_value;
|
2012-03-27 01:24:16 +00:00
|
|
|
tex_radius = r1;
|
|
|
|
alpha = 0.75;
|
|
|
|
break;
|
2015-05-14 14:01:33 +02:00
|
|
|
case PROP_PERCENTAGE:
|
2015-05-14 14:16:28 +02:00
|
|
|
r1 = rc->current_value / 100.0f * WM_RADIAL_CONTROL_DISPLAY_WIDTH + WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE;
|
2015-05-14 14:01:33 +02:00
|
|
|
r2 = tex_radius = WM_RADIAL_CONTROL_DISPLAY_SIZE;
|
|
|
|
rmin = WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE;
|
|
|
|
BLI_snprintf(str, WM_RADIAL_MAX_STR, "%3.1f%%", rc->current_value);
|
|
|
|
strdrawlen = BLI_strlen_utf8(str);
|
|
|
|
tex_radius = r1;
|
|
|
|
alpha = 0.75;
|
|
|
|
break;
|
2012-03-27 01:24:16 +00:00
|
|
|
case PROP_FACTOR:
|
2014-03-24 22:50:02 +02:00
|
|
|
r1 = (1 - rc->current_value) * WM_RADIAL_CONTROL_DISPLAY_WIDTH + WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE;
|
2012-03-27 01:24:16 +00:00
|
|
|
r2 = tex_radius = WM_RADIAL_CONTROL_DISPLAY_SIZE;
|
2014-03-24 22:50:02 +02:00
|
|
|
rmin = WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE;
|
2012-03-27 01:24:16 +00:00
|
|
|
alpha = rc->current_value / 2.0f + 0.5f;
|
2016-03-24 00:59:48 +13:00
|
|
|
BLI_snprintf(str, WM_RADIAL_MAX_STR, "%1.3f", rc->current_value);
|
2014-03-24 22:50:02 +02:00
|
|
|
strdrawlen = BLI_strlen_utf8(str);
|
2012-03-27 01:24:16 +00:00
|
|
|
break;
|
|
|
|
case PROP_ANGLE:
|
|
|
|
r1 = r2 = tex_radius = WM_RADIAL_CONTROL_DISPLAY_SIZE;
|
|
|
|
alpha = 0.75;
|
2014-03-24 23:46:30 +02:00
|
|
|
rmin = WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE;
|
2016-03-24 00:59:48 +13:00
|
|
|
BLI_snprintf(str, WM_RADIAL_MAX_STR, "%3.2f", RAD2DEGF(rc->current_value));
|
2014-03-24 23:46:30 +02:00
|
|
|
strdrawlen = BLI_strlen_utf8(str);
|
2012-03-27 01:24:16 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
tex_radius = WM_RADIAL_CONTROL_DISPLAY_SIZE; /* note, this is a dummy value */
|
|
|
|
alpha = 0.75;
|
|
|
|
break;
|
2011-05-12 01:57:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Keep cursor in the original place */
|
2018-04-30 19:47:33 +02:00
|
|
|
x = rc->initial_mouse[0];
|
|
|
|
y = rc->initial_mouse[1];
|
2018-07-15 15:27:15 +02:00
|
|
|
GPU_matrix_translate_2f((float)x, (float)y);
|
2011-05-12 01:57:47 +00:00
|
|
|
|
|
|
|
glEnable(GL_BLEND);
|
|
|
|
glEnable(GL_LINE_SMOOTH);
|
|
|
|
|
|
|
|
/* apply zoom if available */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (rc->zoom_prop) {
|
2011-05-12 01:57:47 +00:00
|
|
|
RNA_property_float_get_array(&rc->zoom_ptr, rc->zoom_prop, zoom);
|
2018-07-15 15:27:15 +02:00
|
|
|
GPU_matrix_scale_2fv(zoom);
|
2011-05-12 01:57:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* draw rotated texture */
|
|
|
|
radial_control_paint_tex(rc, tex_radius, alpha);
|
|
|
|
|
|
|
|
/* set line color */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (rc->col_prop)
|
2011-05-12 01:57:47 +00:00
|
|
|
RNA_property_float_get_array(&rc->col_ptr, rc->col_prop, col);
|
2016-11-08 10:51:42 -05:00
|
|
|
|
2018-07-18 00:12:21 +02:00
|
|
|
GPUVertFormat *format = immVertexFormat();
|
|
|
|
uint pos = GPU_vertformat_attr_add(format, "pos", GPU_COMP_F32, 2, GPU_FETCH_FLOAT);
|
2016-11-08 10:51:42 -05:00
|
|
|
|
|
|
|
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
|
2017-04-16 12:25:42 -04:00
|
|
|
immUniformColor3fvAlpha(col, 0.5f);
|
2011-05-12 01:57:47 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (rc->subtype == PROP_ANGLE) {
|
2018-07-15 15:27:15 +02:00
|
|
|
GPU_matrix_push();
|
2016-11-08 10:51:42 -05:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* draw original angle line */
|
2018-07-15 15:27:15 +02:00
|
|
|
GPU_matrix_rotate_2d(RAD2DEGF(rc->initial_value));
|
2018-07-18 00:12:21 +02:00
|
|
|
immBegin(GPU_PRIM_LINES, 2);
|
2016-11-08 10:51:42 -05:00
|
|
|
immVertex2f(pos, (float)WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE, 0.0f);
|
|
|
|
immVertex2f(pos, (float)WM_RADIAL_CONTROL_DISPLAY_SIZE, 0.0f);
|
|
|
|
immEnd();
|
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* draw new angle line */
|
2018-07-15 15:27:15 +02:00
|
|
|
GPU_matrix_rotate_2d(RAD2DEGF(rc->current_value - rc->initial_value));
|
2018-07-18 00:12:21 +02:00
|
|
|
immBegin(GPU_PRIM_LINES, 2);
|
2016-11-08 10:51:42 -05:00
|
|
|
immVertex2f(pos, (float)WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE, 0.0f);
|
|
|
|
immVertex2f(pos, (float)WM_RADIAL_CONTROL_DISPLAY_SIZE, 0.0f);
|
|
|
|
immEnd();
|
|
|
|
|
2018-07-15 15:27:15 +02:00
|
|
|
GPU_matrix_pop();
|
2010-07-14 14:11:03 +00:00
|
|
|
}
|
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* draw circles on top */
|
2017-09-14 00:39:28 +10:00
|
|
|
imm_draw_circle_wire_2d(pos, 0.0f, 0.0f, r1, 40);
|
|
|
|
imm_draw_circle_wire_2d(pos, 0.0f, 0.0f, r2, 40);
|
2014-03-24 22:50:02 +02:00
|
|
|
if (rmin > 0.0f)
|
2017-09-14 00:39:28 +10:00
|
|
|
imm_draw_circle_wire_2d(pos, 0.0, 0.0f, rmin, 40);
|
2017-03-30 11:19:58 +02:00
|
|
|
immUnbindProgram();
|
2014-03-24 22:50:02 +02:00
|
|
|
|
2016-10-12 20:15:38 +02:00
|
|
|
BLF_size(fontid, 1.5 * fstyle_points * U.pixelsize, U.dpi);
|
2014-03-25 01:24:40 +02:00
|
|
|
BLF_enable(fontid, BLF_SHADOW);
|
2016-04-22 20:02:03 +10:00
|
|
|
BLF_shadow(fontid, 3, (const float[4]){0.0f, 0.0f, 0.0f, 0.5f});
|
2014-03-25 01:24:40 +02:00
|
|
|
BLF_shadow_offset(fontid, 1, -1);
|
|
|
|
|
2014-03-24 22:50:02 +02:00
|
|
|
/* draw value */
|
2016-03-24 00:55:37 +13:00
|
|
|
BLF_width_and_height(fontid, str, strdrawlen, &strwidth, &strheight);
|
2014-03-24 22:50:02 +02:00
|
|
|
BLF_position(fontid, -0.5f * strwidth, -0.5f * strheight, 0.0f);
|
|
|
|
BLF_draw(fontid, str, strdrawlen);
|
2011-05-12 01:57:47 +00:00
|
|
|
|
2014-03-25 01:24:40 +02:00
|
|
|
BLF_disable(fontid, BLF_SHADOW);
|
|
|
|
|
2009-01-24 16:59:55 +00:00
|
|
|
glDisable(GL_BLEND);
|
2011-05-12 01:57:47 +00:00
|
|
|
glDisable(GL_LINE_SMOOTH);
|
2016-11-08 10:51:42 -05:00
|
|
|
|
2009-01-24 16:59:55 +00:00
|
|
|
}
|
|
|
|
|
2012-01-14 23:54:51 +00:00
|
|
|
typedef enum {
|
|
|
|
RC_PROP_ALLOW_MISSING = 1,
|
|
|
|
RC_PROP_REQUIRE_FLOAT = 2,
|
|
|
|
RC_PROP_REQUIRE_BOOL = 4,
|
|
|
|
} RCPropFlags;
|
|
|
|
|
2015-06-01 14:56:07 +10:00
|
|
|
/**
|
|
|
|
* Attempt to retrieve the rna pointer/property from an rna path.
|
|
|
|
*
|
|
|
|
* \return 0 for failure, 1 for success, and also 1 if property is not set.
|
|
|
|
*/
|
|
|
|
static int radial_control_get_path(
|
|
|
|
PointerRNA *ctx_ptr, wmOperator *op,
|
|
|
|
const char *name, PointerRNA *r_ptr,
|
|
|
|
PropertyRNA **r_prop, int req_length, RCPropFlags flags)
|
2009-01-24 16:59:55 +00:00
|
|
|
{
|
2011-05-12 01:57:47 +00:00
|
|
|
PropertyRNA *unused_prop;
|
|
|
|
int len;
|
|
|
|
char *str;
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2012-01-14 23:54:51 +00:00
|
|
|
/* check flags */
|
2012-03-24 06:24:53 +00:00
|
|
|
if ((flags & RC_PROP_REQUIRE_BOOL) && (flags & RC_PROP_REQUIRE_FLOAT)) {
|
2012-10-19 16:43:10 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Property cannot be both boolean and float");
|
2012-01-14 23:54:51 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* get an rna string path from the operator's properties */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!(str = RNA_string_get_alloc(op->ptr, name, NULL, 0)))
|
2011-05-12 01:57:47 +00:00
|
|
|
return 1;
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (str[0] == '\0') {
|
|
|
|
if (r_prop) *r_prop = NULL;
|
2011-05-12 01:57:47 +00:00
|
|
|
MEM_freeN(str);
|
|
|
|
return 1;
|
|
|
|
}
|
2010-07-14 14:11:03 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!r_prop)
|
2011-05-12 01:57:47 +00:00
|
|
|
r_prop = &unused_prop;
|
2010-07-14 14:11:03 +00:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* get rna from path */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!RNA_path_resolve(ctx_ptr, str, r_ptr, r_prop)) {
|
2011-05-12 01:57:47 +00:00
|
|
|
MEM_freeN(str);
|
2012-03-24 06:24:53 +00:00
|
|
|
if (flags & RC_PROP_ALLOW_MISSING)
|
2011-05-12 01:57:47 +00:00
|
|
|
return 1;
|
|
|
|
else {
|
2012-10-19 16:43:10 +00:00
|
|
|
BKE_reportf(op->reports, RPT_ERROR, "Could not resolve path '%s'", name);
|
2011-05-12 01:57:47 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2012-01-14 23:54:51 +00:00
|
|
|
/* check property type */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (flags & (RC_PROP_REQUIRE_BOOL | RC_PROP_REQUIRE_FLOAT)) {
|
2012-01-14 23:54:51 +00:00
|
|
|
PropertyType prop_type = RNA_property_type(*r_prop);
|
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (((flags & RC_PROP_REQUIRE_BOOL) && (prop_type != PROP_BOOLEAN)) ||
|
2014-11-01 22:25:57 +01:00
|
|
|
((flags & RC_PROP_REQUIRE_FLOAT) && (prop_type != PROP_FLOAT)))
|
2012-05-20 19:49:27 +00:00
|
|
|
{
|
2011-05-12 01:57:47 +00:00
|
|
|
MEM_freeN(str);
|
2012-10-19 16:43:10 +00:00
|
|
|
BKE_reportf(op->reports, RPT_ERROR, "Property from path '%s' is not a float", name);
|
2011-05-12 01:57:47 +00:00
|
|
|
return 0;
|
2009-01-24 22:58:22 +00:00
|
|
|
}
|
2011-05-12 01:57:47 +00:00
|
|
|
}
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* check property's array length */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (*r_prop && (len = RNA_property_array_length(r_ptr, *r_prop)) != req_length) {
|
2011-05-12 01:57:47 +00:00
|
|
|
MEM_freeN(str);
|
2012-10-19 16:43:10 +00:00
|
|
|
BKE_reportf(op->reports, RPT_ERROR, "Property from path '%s' has length %d instead of %d",
|
2011-11-11 13:09:14 +00:00
|
|
|
name, len, req_length);
|
2011-05-12 01:57:47 +00:00
|
|
|
return 0;
|
2009-01-24 16:59:55 +00:00
|
|
|
}
|
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* success */
|
|
|
|
MEM_freeN(str);
|
|
|
|
return 1;
|
|
|
|
}
|
2009-01-24 22:58:22 +00:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* initialize the rna pointers and properties using rna paths */
|
|
|
|
static int radial_control_get_properties(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
RadialControl *rc = op->customdata;
|
2012-01-14 23:54:51 +00:00
|
|
|
PointerRNA ctx_ptr, use_secondary_ptr;
|
2013-03-19 10:54:52 +00:00
|
|
|
PropertyRNA *use_secondary_prop = NULL;
|
2012-01-14 23:54:51 +00:00
|
|
|
const char *data_path;
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
RNA_pointer_create(NULL, &RNA_Context, C, &ctx_ptr);
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2012-01-14 23:54:51 +00:00
|
|
|
/* check if we use primary or secondary path */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!radial_control_get_path(&ctx_ptr, op, "use_secondary",
|
2012-03-27 01:24:16 +00:00
|
|
|
&use_secondary_ptr, &use_secondary_prop,
|
|
|
|
0, (RC_PROP_ALLOW_MISSING |
|
|
|
|
RC_PROP_REQUIRE_BOOL)))
|
|
|
|
{
|
2012-01-14 23:54:51 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
2012-03-24 06:24:53 +00:00
|
|
|
if (use_secondary_prop &&
|
2012-03-27 01:24:16 +00:00
|
|
|
RNA_property_boolean_get(&use_secondary_ptr, use_secondary_prop))
|
2012-04-28 06:31:57 +00:00
|
|
|
{
|
2012-01-14 23:54:51 +00:00
|
|
|
data_path = "data_path_secondary";
|
2012-04-28 06:31:57 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-01-14 23:54:51 +00:00
|
|
|
data_path = "data_path_primary";
|
2012-04-28 06:31:57 +00:00
|
|
|
}
|
2012-01-14 23:54:51 +00:00
|
|
|
}
|
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!radial_control_get_path(&ctx_ptr, op, data_path, &rc->ptr, &rc->prop, 0, 0))
|
2011-05-12 01:57:47 +00:00
|
|
|
return 0;
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* data path is required */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!rc->prop)
|
2011-05-12 01:57:47 +00:00
|
|
|
return 0;
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!radial_control_get_path(&ctx_ptr, op, "rotation_path", &rc->rot_ptr, &rc->rot_prop, 0, RC_PROP_REQUIRE_FLOAT))
|
2011-05-12 01:57:47 +00:00
|
|
|
return 0;
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!radial_control_get_path(&ctx_ptr, op, "color_path", &rc->col_ptr, &rc->col_prop, 3, RC_PROP_REQUIRE_FLOAT))
|
2011-05-12 01:57:47 +00:00
|
|
|
return 0;
|
2016-02-10 01:48:02 +11:00
|
|
|
|
|
|
|
|
|
|
|
if (!radial_control_get_path(
|
|
|
|
&ctx_ptr, op, "fill_color_path", &rc->fill_col_ptr, &rc->fill_col_prop, 3, RC_PROP_REQUIRE_FLOAT))
|
|
|
|
{
|
2011-05-12 01:57:47 +00:00
|
|
|
return 0;
|
2016-02-10 01:48:02 +11:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!radial_control_get_path(
|
|
|
|
&ctx_ptr, op, "fill_color_override_path",
|
|
|
|
&rc->fill_col_override_ptr, &rc->fill_col_override_prop, 3, RC_PROP_REQUIRE_FLOAT))
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!radial_control_get_path(
|
|
|
|
&ctx_ptr, op, "fill_color_override_test_path",
|
|
|
|
&rc->fill_col_override_test_ptr, &rc->fill_col_override_test_prop, 0, RC_PROP_REQUIRE_BOOL))
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* slightly ugly; allow this property to not resolve
|
2012-02-19 06:00:20 +00:00
|
|
|
* correctly. needed because 3d texture paint shares the same
|
|
|
|
* keymap as 2d image paint */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!radial_control_get_path(&ctx_ptr, op, "zoom_path",
|
2012-03-27 01:24:16 +00:00
|
|
|
&rc->zoom_ptr, &rc->zoom_prop, 2,
|
|
|
|
RC_PROP_REQUIRE_FLOAT | RC_PROP_ALLOW_MISSING))
|
2012-04-28 06:31:57 +00:00
|
|
|
{
|
2011-05-12 01:57:47 +00:00
|
|
|
return 0;
|
2012-04-28 06:31:57 +00:00
|
|
|
}
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!radial_control_get_path(&ctx_ptr, op, "image_id", &rc->image_id_ptr, NULL, 0, 0))
|
2011-05-12 01:57:47 +00:00
|
|
|
return 0;
|
2012-03-24 06:24:53 +00:00
|
|
|
else if (rc->image_id_ptr.data) {
|
2011-05-12 01:57:47 +00:00
|
|
|
/* extra check, pointer must be to an ID */
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!RNA_struct_is_ID(rc->image_id_ptr.type)) {
|
2012-10-19 16:43:10 +00:00
|
|
|
BKE_report(op->reports, RPT_ERROR, "Pointer from path image_id is not an ID");
|
2011-05-12 01:57:47 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
2010-07-14 14:11:03 +00:00
|
|
|
|
2013-09-05 14:02:59 +00:00
|
|
|
rc->use_secondary_tex = RNA_boolean_get(op->ptr, "secondary_tex");
|
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
return 1;
|
2009-01-24 16:59:55 +00:00
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int radial_control_invoke(bContext *C, wmOperator *op, const wmEvent *event)
|
2009-01-24 16:59:55 +00:00
|
|
|
{
|
2011-05-12 01:57:47 +00:00
|
|
|
wmWindowManager *wm;
|
|
|
|
RadialControl *rc;
|
2015-06-15 22:26:19 +10:00
|
|
|
|
2010-11-03 06:31:53 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!(op->customdata = rc = MEM_callocN(sizeof(RadialControl), "RadialControl")))
|
2011-05-12 01:57:47 +00:00
|
|
|
return OPERATOR_CANCELLED;
|
2010-07-14 14:11:03 +00:00
|
|
|
|
2012-03-24 06:24:53 +00:00
|
|
|
if (!radial_control_get_properties(C, op)) {
|
2011-05-12 01:57:47 +00:00
|
|
|
MEM_freeN(rc);
|
|
|
|
return OPERATOR_CANCELLED;
|
2009-01-24 22:58:22 +00:00
|
|
|
}
|
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* get type, initial, min, and max values of the property */
|
2012-03-27 01:24:16 +00:00
|
|
|
switch ((rc->type = RNA_property_type(rc->prop))) {
|
|
|
|
case PROP_INT:
|
2015-06-15 22:26:19 +10:00
|
|
|
{
|
|
|
|
int value, min, max, step;
|
|
|
|
|
|
|
|
value = RNA_property_int_get(&rc->ptr, rc->prop);
|
|
|
|
RNA_property_int_ui_range(&rc->ptr, rc->prop, &min, &max, &step);
|
|
|
|
|
|
|
|
rc->initial_value = value;
|
|
|
|
rc->min_value = min_ii(value, min);
|
|
|
|
rc->max_value = max_ii(value, max);
|
2012-03-27 01:24:16 +00:00
|
|
|
break;
|
2015-06-15 22:26:19 +10:00
|
|
|
}
|
2012-03-27 01:24:16 +00:00
|
|
|
case PROP_FLOAT:
|
2015-06-15 22:26:19 +10:00
|
|
|
{
|
|
|
|
float value, min, max, step, precision;
|
|
|
|
|
|
|
|
value = RNA_property_float_get(&rc->ptr, rc->prop);
|
2015-06-15 15:40:40 +02:00
|
|
|
RNA_property_float_ui_range(&rc->ptr, rc->prop, &min, &max, &step, &precision);
|
2015-06-15 22:26:19 +10:00
|
|
|
|
|
|
|
rc->initial_value = value;
|
|
|
|
rc->min_value = min_ff(value, min);
|
|
|
|
rc->max_value = max_ff(value, max);
|
2012-03-27 01:24:16 +00:00
|
|
|
break;
|
2015-06-15 22:26:19 +10:00
|
|
|
}
|
2012-03-27 01:24:16 +00:00
|
|
|
default:
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "Property must be an integer or a float");
|
|
|
|
MEM_freeN(rc);
|
|
|
|
return OPERATOR_CANCELLED;
|
2009-01-24 16:59:55 +00:00
|
|
|
}
|
|
|
|
|
2014-11-17 16:12:07 +01:00
|
|
|
/* initialize numerical input */
|
|
|
|
initNumInput(&rc->num_input);
|
|
|
|
rc->num_input.idx_max = 0;
|
|
|
|
rc->num_input.val_flag[0] |= NUM_NO_NEGATIVE;
|
|
|
|
rc->num_input.unit_sys = USER_UNIT_NONE;
|
|
|
|
rc->num_input.unit_type[0] = B_UNIT_LENGTH;
|
2014-11-17 15:44:19 +01:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* get subtype of property */
|
|
|
|
rc->subtype = RNA_property_subtype(rc->prop);
|
2014-11-16 10:53:47 +01:00
|
|
|
if (!ELEM(rc->subtype, PROP_NONE, PROP_DISTANCE, PROP_FACTOR, PROP_PERCENTAGE, PROP_ANGLE, PROP_PIXEL)) {
|
|
|
|
BKE_report(op->reports, RPT_ERROR, "Property must be a none, distance, factor, percentage, angle, or pixel");
|
2011-05-12 01:57:47 +00:00
|
|
|
MEM_freeN(rc);
|
|
|
|
return OPERATOR_CANCELLED;
|
|
|
|
}
|
2014-11-17 15:44:19 +01:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
rc->current_value = rc->initial_value;
|
|
|
|
radial_control_set_initial_mouse(rc, event);
|
|
|
|
radial_control_set_tex(rc);
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* temporarily disable other paint cursors */
|
|
|
|
wm = CTX_wm_manager(C);
|
|
|
|
rc->orig_paintcursors = wm->paintcursors;
|
2014-02-08 06:07:10 +11:00
|
|
|
BLI_listbase_clear(&wm->paintcursors);
|
2011-05-12 01:57:47 +00:00
|
|
|
|
|
|
|
/* add radial control paint cursor */
|
2018-10-25 16:06:47 +11:00
|
|
|
rc->cursor = WM_paint_cursor_activate(
|
|
|
|
wm,
|
|
|
|
SPACE_TYPE_ANY, RGN_TYPE_ANY,
|
|
|
|
op->type->poll,
|
|
|
|
radial_control_paint_cursor, rc);
|
2010-07-14 14:11:03 +00:00
|
|
|
|
2009-09-18 12:43:36 +00:00
|
|
|
WM_event_add_modal_handler(C, op);
|
2011-05-12 01:57:47 +00:00
|
|
|
|
2009-01-24 16:59:55 +00:00
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
|
Paint refactoring commit, non-disruptive (in theory :p)
* Fix precision overflow issue with overlay previews,
* Expose alpha mask mapping to UI (still not functional but coming soon).
* More overlay refactoring:
Overlay now does minimal checking for texture refresh.
Instead, we now have invalidation flags to set an aspect of the brush
overlay as invalid. This is necessary because this way we will be able to
separate and preview different brush attributes on the overlays, using
different textures:
These attributes/aspects are:
Primary texture (main texture for sculpt, vertex, imapaint)
Secondary texture (mask/alpha texture for imapaint)
Cursor texture (cursor texture. It involves brush strength and curves)
Modified the relevant RNA property update functions and C update callback
functions to call the relevant cursor invalidation functions instead
of checking every frame for multiple properties.
Properties that affect this are:
Image changes, if image is used by current brush,
Texture slot changes, similarly
Curve changes,
Object mode change invalidates the cursor
Paint tool change invalidates the cursor.
These changes give slightly more invalidation cases than simply
comparing the relevant properties each frame, but these do not occur in
performance critical moments and it's a much more elegant system than
adding more variables to check per frame each time we add something on
the system.
2013-04-12 17:21:31 +00:00
|
|
|
static void radial_control_set_value(RadialControl *rc, float val)
|
2009-01-25 21:02:52 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
switch (rc->type) {
|
|
|
|
case PROP_INT:
|
|
|
|
RNA_property_int_set(&rc->ptr, rc->prop, val);
|
|
|
|
break;
|
|
|
|
case PROP_FLOAT:
|
|
|
|
RNA_property_float_set(&rc->ptr, rc->prop, val);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2011-05-12 01:57:47 +00:00
|
|
|
}
|
2009-01-25 21:02:52 +00:00
|
|
|
}
|
|
|
|
|
2013-10-30 23:08:53 +00:00
|
|
|
static void radial_control_cancel(bContext *C, wmOperator *op)
|
2011-06-06 11:04:54 +00:00
|
|
|
{
|
|
|
|
RadialControl *rc = op->customdata;
|
|
|
|
wmWindowManager *wm = CTX_wm_manager(C);
|
2015-03-14 12:10:09 +11:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
2011-06-06 11:04:54 +00:00
|
|
|
|
2014-08-27 17:47:37 +02:00
|
|
|
if (rc->dial) {
|
|
|
|
MEM_freeN(rc->dial);
|
|
|
|
rc->dial = NULL;
|
|
|
|
}
|
2014-11-17 15:44:19 +01:00
|
|
|
|
2018-06-28 12:06:00 +02:00
|
|
|
ED_area_status_text(sa, NULL);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2011-06-06 11:04:54 +00:00
|
|
|
WM_paint_cursor_end(wm, rc->cursor);
|
|
|
|
|
|
|
|
/* restore original paint cursors */
|
|
|
|
wm->paintcursors = rc->orig_paintcursors;
|
|
|
|
|
|
|
|
/* not sure if this is a good notifier to use;
|
2012-03-09 18:28:30 +00:00
|
|
|
* intended purpose is to update the UI so that the
|
|
|
|
* new value is displayed in sliders/numfields */
|
2011-06-06 11:04:54 +00:00
|
|
|
WM_event_add_notifier(C, NC_WINDOW, NULL);
|
|
|
|
|
|
|
|
glDeleteTextures(1, &rc->gltex);
|
|
|
|
|
|
|
|
MEM_freeN(rc);
|
|
|
|
}
|
|
|
|
|
2013-03-13 09:03:46 +00:00
|
|
|
static int radial_control_modal(bContext *C, wmOperator *op, const wmEvent *event)
|
2009-01-24 16:59:55 +00:00
|
|
|
{
|
2011-05-12 01:57:47 +00:00
|
|
|
RadialControl *rc = op->customdata;
|
2015-09-04 01:04:37 +02:00
|
|
|
float new_value, dist = 0.0f, zoom[2];
|
2014-08-14 11:39:54 +02:00
|
|
|
float delta[2], ret = OPERATOR_RUNNING_MODAL;
|
|
|
|
bool snap;
|
2014-08-27 17:47:37 +02:00
|
|
|
float angle_precision = 0.0f;
|
2015-03-11 13:14:24 +11:00
|
|
|
const bool has_numInput = hasNumInput(&rc->num_input);
|
|
|
|
bool handled = false;
|
|
|
|
float numValue;
|
2011-05-12 01:57:47 +00:00
|
|
|
/* TODO: fix hardcoded events */
|
|
|
|
|
2014-08-14 11:39:54 +02:00
|
|
|
snap = event->ctrl != 0;
|
2011-05-12 01:57:47 +00:00
|
|
|
|
2014-11-17 16:12:07 +01:00
|
|
|
/* Modal numinput active, try to handle numeric inputs first... */
|
|
|
|
if (event->val == KM_PRESS && has_numInput && handleNumInput(C, &rc->num_input, event)) {
|
|
|
|
handled = true;
|
|
|
|
applyNumInput(&rc->num_input, &numValue);
|
2015-01-09 19:23:15 +01:00
|
|
|
|
|
|
|
if (rc->subtype == PROP_ANGLE) {
|
|
|
|
numValue = DEG2RADF(numValue);
|
|
|
|
numValue = fmod(numValue, 2.0f * (float)M_PI);
|
|
|
|
if (numValue < 0.0f)
|
|
|
|
numValue += 2.0f * (float)M_PI;
|
|
|
|
}
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2014-11-17 16:12:07 +01:00
|
|
|
CLAMP(numValue, rc->min_value, rc->max_value);
|
|
|
|
new_value = numValue;
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2014-11-17 16:12:07 +01:00
|
|
|
radial_control_set_value(rc, new_value);
|
|
|
|
rc->current_value = new_value;
|
|
|
|
radial_control_update_header(op, C);
|
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
handled = false;
|
|
|
|
switch (event->type) {
|
|
|
|
case ESCKEY:
|
|
|
|
case RIGHTMOUSE:
|
|
|
|
/* canceled; restore original value */
|
|
|
|
radial_control_set_value(rc, rc->initial_value);
|
|
|
|
ret = OPERATOR_CANCELLED;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case LEFTMOUSE:
|
|
|
|
case PADENTER:
|
|
|
|
case RETKEY:
|
|
|
|
/* done; value already set */
|
|
|
|
RNA_property_update(C, &rc->ptr, rc->prop);
|
|
|
|
ret = OPERATOR_FINISHED;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case MOUSEMOVE:
|
|
|
|
if (!has_numInput) {
|
|
|
|
if (rc->slow_mode) {
|
|
|
|
if (rc->subtype == PROP_ANGLE) {
|
|
|
|
float position[2] = {event->x, event->y};
|
|
|
|
|
|
|
|
/* calculate the initial angle here first */
|
|
|
|
delta[0] = rc->initial_mouse[0] - rc->slow_mouse[0];
|
|
|
|
delta[1] = rc->initial_mouse[1] - rc->slow_mouse[1];
|
|
|
|
|
|
|
|
/* precision angle gets calculated from dial and gets added later */
|
|
|
|
angle_precision = -0.1f * BLI_dial_angle(rc->dial, position);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
delta[0] = rc->initial_mouse[0] - rc->slow_mouse[0];
|
|
|
|
delta[1] = rc->initial_mouse[1] - rc->slow_mouse[1];
|
|
|
|
|
|
|
|
if (rc->zoom_prop) {
|
|
|
|
RNA_property_float_get_array(&rc->zoom_ptr, rc->zoom_prop, zoom);
|
|
|
|
delta[0] /= zoom[0];
|
|
|
|
delta[1] /= zoom[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
dist = len_v2(delta);
|
|
|
|
|
|
|
|
delta[0] = event->x - rc->slow_mouse[0];
|
|
|
|
delta[1] = event->y - rc->slow_mouse[1];
|
|
|
|
|
|
|
|
if (rc->zoom_prop) {
|
|
|
|
delta[0] /= zoom[0];
|
|
|
|
delta[1] /= zoom[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
dist = dist + 0.1f * (delta[0] + delta[1]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
delta[0] = rc->initial_mouse[0] - event->x;
|
|
|
|
delta[1] = rc->initial_mouse[1] - event->y;
|
|
|
|
|
|
|
|
if (rc->zoom_prop) {
|
|
|
|
RNA_property_float_get_array(&rc->zoom_ptr, rc->zoom_prop, zoom);
|
|
|
|
delta[0] /= zoom[0];
|
|
|
|
delta[1] /= zoom[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
dist = len_v2(delta);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* calculate new value and apply snapping */
|
|
|
|
switch (rc->subtype) {
|
|
|
|
case PROP_NONE:
|
|
|
|
case PROP_DISTANCE:
|
|
|
|
case PROP_PIXEL:
|
|
|
|
new_value = dist;
|
|
|
|
if (snap) new_value = ((int)new_value + 5) / 10 * 10;
|
|
|
|
break;
|
2015-05-14 14:01:33 +02:00
|
|
|
case PROP_PERCENTAGE:
|
2015-05-14 14:16:28 +02:00
|
|
|
new_value = ((dist - WM_RADIAL_CONTROL_DISPLAY_MIN_SIZE) / WM_RADIAL_CONTROL_DISPLAY_WIDTH) * 100.0f;
|
2015-07-25 13:26:20 +10:00
|
|
|
if (snap) new_value = ((int)(new_value + 2.5f)) / 5 * 5;
|
2015-05-14 14:01:33 +02:00
|
|
|
break;
|
2014-11-17 16:12:07 +01:00
|
|
|
case PROP_FACTOR:
|
|
|
|
new_value = (WM_RADIAL_CONTROL_DISPLAY_SIZE - dist) / WM_RADIAL_CONTROL_DISPLAY_WIDTH;
|
|
|
|
if (snap) new_value = ((int)ceil(new_value * 10.f) * 10.0f) / 100.f;
|
|
|
|
break;
|
|
|
|
case PROP_ANGLE:
|
2015-01-31 17:23:30 +11:00
|
|
|
new_value = atan2f(delta[1], delta[0]) + (float)M_PI + angle_precision;
|
2014-11-17 16:12:07 +01:00
|
|
|
new_value = fmod(new_value, 2.0f * (float)M_PI);
|
|
|
|
if (new_value < 0.0f)
|
|
|
|
new_value += 2.0f * (float)M_PI;
|
|
|
|
if (snap) new_value = DEG2RADF(((int)RAD2DEGF(new_value) + 5) / 10 * 10);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
new_value = dist; /* dummy value, should this ever happen? - campbell */
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* clamp and update */
|
|
|
|
CLAMP(new_value, rc->min_value, rc->max_value);
|
|
|
|
radial_control_set_value(rc, new_value);
|
|
|
|
rc->current_value = new_value;
|
|
|
|
handled = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case LEFTSHIFTKEY:
|
|
|
|
case RIGHTSHIFTKEY:
|
|
|
|
{
|
|
|
|
if (event->val == KM_PRESS) {
|
|
|
|
rc->slow_mouse[0] = event->x;
|
|
|
|
rc->slow_mouse[1] = event->y;
|
|
|
|
rc->slow_mode = true;
|
|
|
|
if (rc->subtype == PROP_ANGLE) {
|
|
|
|
float initial_position[2] = {UNPACK2(rc->initial_mouse)};
|
|
|
|
float current_position[2] = {UNPACK2(rc->slow_mouse)};
|
|
|
|
rc->dial = BLI_dial_initialize(initial_position, 0.0f);
|
|
|
|
/* immediately set the position to get a an initial direction */
|
|
|
|
BLI_dial_angle(rc->dial, current_position);
|
|
|
|
}
|
|
|
|
handled = true;
|
|
|
|
}
|
|
|
|
if (event->val == KM_RELEASE) {
|
|
|
|
rc->slow_mode = false;
|
|
|
|
handled = true;
|
|
|
|
if (rc->dial) {
|
|
|
|
MEM_freeN(rc->dial);
|
|
|
|
rc->dial = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Modal numinput inactive, try to handle numeric inputs last... */
|
|
|
|
if (!handled && event->val == KM_PRESS && handleNumInput(C, &rc->num_input, event)) {
|
|
|
|
applyNumInput(&rc->num_input, &numValue);
|
2015-01-09 19:23:15 +01:00
|
|
|
|
|
|
|
if (rc->subtype == PROP_ANGLE) {
|
|
|
|
numValue = DEG2RADF(numValue);
|
|
|
|
numValue = fmod(numValue, 2.0f * (float)M_PI);
|
|
|
|
if (numValue < 0.0f)
|
|
|
|
numValue += 2.0f * (float)M_PI;
|
|
|
|
}
|
|
|
|
|
2014-11-17 16:12:07 +01:00
|
|
|
CLAMP(numValue, rc->min_value, rc->max_value);
|
|
|
|
new_value = numValue;
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2014-11-17 16:12:07 +01:00
|
|
|
radial_control_set_value(rc, new_value);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2014-11-17 16:12:07 +01:00
|
|
|
rc->current_value = new_value;
|
|
|
|
radial_control_update_header(op, C);
|
|
|
|
return OPERATOR_RUNNING_MODAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ED_region_tag_redraw(CTX_wm_region(C));
|
2016-03-24 00:55:37 +13:00
|
|
|
radial_control_update_header(op, C);
|
2014-11-17 16:12:07 +01:00
|
|
|
|
|
|
|
if (ret != OPERATOR_RUNNING_MODAL)
|
|
|
|
radial_control_cancel(C, op);
|
|
|
|
|
|
|
|
return ret;
|
2011-05-12 01:57:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void WM_OT_radial_control(wmOperatorType *ot)
|
|
|
|
{
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Radial Control";
|
|
|
|
ot->idname = "WM_OT_radial_control";
|
2012-05-06 15:03:31 +00:00
|
|
|
ot->description = "Set some size property (like e.g. brush size) with mouse wheel";
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = radial_control_invoke;
|
|
|
|
ot->modal = radial_control_modal;
|
|
|
|
ot->cancel = radial_control_cancel;
|
2009-01-24 16:59:55 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
|
2010-08-20 09:41:16 +00:00
|
|
|
|
2011-05-12 01:57:47 +00:00
|
|
|
/* all paths relative to the context */
|
2018-02-28 16:14:35 +01:00
|
|
|
PropertyRNA *prop;
|
|
|
|
prop = RNA_def_string(ot->srna, "data_path_primary", NULL, 0, "Primary Data Path", "Primary path of property to be set by the radial control");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2013-11-25 05:13:05 +01:00
|
|
|
|
2018-02-28 16:14:35 +01:00
|
|
|
prop = RNA_def_string(ot->srna, "data_path_secondary", NULL, 0, "Secondary Data Path", "Secondary path of property to be set by the radial control");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2013-11-25 05:13:05 +01:00
|
|
|
|
2018-02-28 16:14:35 +01:00
|
|
|
prop = RNA_def_string(ot->srna, "use_secondary", NULL, 0, "Use Secondary", "Path of property to select between the primary and secondary data paths");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2013-11-25 05:13:05 +01:00
|
|
|
|
2018-02-28 16:14:35 +01:00
|
|
|
prop = RNA_def_string(ot->srna, "rotation_path", NULL, 0, "Rotation Path", "Path of property used to rotate the texture display");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2013-11-25 05:13:05 +01:00
|
|
|
|
2018-02-28 16:14:35 +01:00
|
|
|
prop = RNA_def_string(ot->srna, "color_path", NULL, 0, "Color Path", "Path of property used to set the color of the control");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2013-11-25 05:13:05 +01:00
|
|
|
|
2018-02-28 16:14:35 +01:00
|
|
|
prop = RNA_def_string(ot->srna, "fill_color_path", NULL, 0, "Fill Color Path", "Path of property used to set the fill color of the control");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2013-11-25 05:13:05 +01:00
|
|
|
|
2018-02-28 16:14:35 +01:00
|
|
|
prop = RNA_def_string(ot->srna, "fill_color_override_path", NULL, 0, "Fill Color Override Path", "");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
|
|
|
prop = RNA_def_string(ot->srna, "fill_color_override_test_path", NULL, 0, "Fill Color Override Test", "");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2016-02-10 01:48:02 +11:00
|
|
|
|
2018-02-28 16:14:35 +01:00
|
|
|
prop = RNA_def_string(ot->srna, "zoom_path", NULL, 0, "Zoom Path", "Path of property used to set the zoom level for the control");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2013-11-25 05:13:05 +01:00
|
|
|
|
2018-02-28 16:14:35 +01:00
|
|
|
prop = RNA_def_string(ot->srna, "image_id", NULL, 0, "Image ID", "Path of ID that is used to generate an image for the control");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2013-11-25 05:13:05 +01:00
|
|
|
|
2018-02-28 16:14:35 +01:00
|
|
|
prop = RNA_def_boolean(ot->srna, "secondary_tex", false, "Secondary Texture", "Tweak brush secondary/mask texture");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2009-01-24 16:59:55 +00:00
|
|
|
}
|
|
|
|
|
2009-05-19 12:54:54 +00:00
|
|
|
/* ************************** timer for testing ***************** */
|
|
|
|
|
|
|
|
/* uses no type defines, fully local testing function anyway... ;) */
|
|
|
|
|
2010-06-14 10:33:26 +00:00
|
|
|
static void redraw_timer_window_swap(bContext *C)
|
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
wmWindow *win = CTX_wm_window(C);
|
2010-06-14 10:33:26 +00:00
|
|
|
ScrArea *sa;
|
2014-09-18 15:58:37 +02:00
|
|
|
CTX_wm_menu_set(C, NULL);
|
2010-06-14 10:33:26 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
for (sa = CTX_wm_screen(C)->areabase.first; sa; sa = sa->next)
|
2010-06-14 10:33:26 +00:00
|
|
|
ED_area_tag_redraw(sa);
|
|
|
|
wm_draw_update(C);
|
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
CTX_wm_window_set(C, win); /* XXX context manipulation warning! */
|
2010-06-14 10:33:26 +00:00
|
|
|
}
|
|
|
|
|
2015-07-12 22:57:35 +10:00
|
|
|
enum {
|
2015-06-23 12:53:33 +02:00
|
|
|
eRTDrawRegion = 0,
|
|
|
|
eRTDrawRegionSwap = 1,
|
|
|
|
eRTDrawWindow = 2,
|
|
|
|
eRTDrawWindowSwap = 3,
|
|
|
|
eRTAnimationStep = 4,
|
|
|
|
eRTAnimationPlay = 5,
|
|
|
|
eRTUndo = 6,
|
|
|
|
};
|
|
|
|
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem redraw_timer_type_items[] = {
|
2015-06-23 12:53:33 +02:00
|
|
|
{eRTDrawRegion, "DRAW", 0, "Draw Region", "Draw Region"},
|
|
|
|
{eRTDrawRegionSwap, "DRAW_SWAP", 0, "Draw Region + Swap", "Draw Region and Swap"},
|
|
|
|
{eRTDrawWindow, "DRAW_WIN", 0, "Draw Window", "Draw Window"},
|
|
|
|
{eRTDrawWindowSwap, "DRAW_WIN_SWAP", 0, "Draw Window + Swap", "Draw Window and Swap"},
|
|
|
|
{eRTAnimationStep, "ANIM_STEP", 0, "Anim Step", "Animation Steps"},
|
|
|
|
{eRTAnimationPlay, "ANIM_PLAY", 0, "Anim Play", "Animation Playback"},
|
2015-06-23 12:58:33 +02:00
|
|
|
{eRTUndo, "UNDO", 0, "Undo/Redo", "Undo/Redo"},
|
|
|
|
{0, NULL, 0, NULL, NULL}
|
2012-03-27 01:24:16 +00:00
|
|
|
};
|
2010-06-14 10:33:26 +00:00
|
|
|
|
2009-09-22 09:12:39 +00:00
|
|
|
|
2015-07-12 22:57:35 +10:00
|
|
|
static void redraw_timer_step(
|
2018-04-06 11:21:20 +02:00
|
|
|
bContext *C, Main *bmain, Scene *scene,
|
2017-11-09 11:20:17 +01:00
|
|
|
struct Depsgraph *depsgraph,
|
2015-07-13 00:21:08 +10:00
|
|
|
wmWindow *win, ScrArea *sa, ARegion *ar,
|
2015-07-12 22:57:35 +10:00
|
|
|
const int type, const int cfra)
|
|
|
|
{
|
|
|
|
if (type == eRTDrawRegion) {
|
|
|
|
if (ar) {
|
|
|
|
ED_region_do_draw(C, ar);
|
|
|
|
ar->do_draw = false;
|
2009-05-19 12:54:54 +00:00
|
|
|
}
|
2015-07-12 22:57:35 +10:00
|
|
|
}
|
|
|
|
else if (type == eRTDrawRegionSwap) {
|
|
|
|
CTX_wm_menu_set(C, NULL);
|
2009-09-22 09:12:39 +00:00
|
|
|
|
2015-07-12 22:57:35 +10:00
|
|
|
ED_region_tag_redraw(ar);
|
|
|
|
wm_draw_update(C);
|
|
|
|
|
|
|
|
CTX_wm_window_set(C, win); /* XXX context manipulation warning! */
|
|
|
|
}
|
|
|
|
else if (type == eRTDrawWindow) {
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
bScreen *screen = WM_window_get_active_screen(win);
|
2015-07-13 00:21:08 +10:00
|
|
|
ScrArea *sa_iter;
|
2015-07-12 22:57:35 +10:00
|
|
|
|
|
|
|
CTX_wm_menu_set(C, NULL);
|
|
|
|
|
Main Workspace Integration
This commit does the main integration of workspaces, which is a design we agreed on during the 2.8 UI workshop (see https://wiki.blender.org/index.php/Dev:2.8/UI/Workshop_Writeup)
Workspaces should generally be stable, I'm not aware of any remaining bugs (or I've forgotten them :) ). If you find any, let me know!
(Exception: mode switching button might get out of sync with actual mode in some cases, would consider that a limitation/ToDo. Needs to be resolved at some point.)
== Main Changes/Features
* Introduces the new Workspaces as data-blocks.
* Allow storing a number of custom workspaces as part of the user configuration. Needs further work to allow adding and deleting individual workspaces.
* Bundle a default workspace configuration with Blender (current screen-layouts converted to workspaces).
* Pressing button to add a workspace spawns a menu to select between "Duplicate Current" and the workspaces from the user configuration. If no workspaces are stored in the user configuration, the default workspaces are listed instead.
* Store screen-layouts (`bScreen`) per workspace.
* Store an active screen-layout per workspace. Changing the workspace will enable this layout.
* Store active mode in workspace. Changing the workspace will also enter the mode of the new workspace. (Note that we still store the active mode in the object, moving this completely to workspaces is a separate project.)
* Store an active render layer per workspace.
* Moved mode switch from 3D View header to Info Editor header.
* Store active scene in window (not directly workspace related, but overlaps quite a bit).
* Removed 'Use Global Scene' User Preference option.
* Compatibility with old files - a new workspace is created for every screen-layout of old files. Old Blender versions should be able to read files saved with workspace support as well.
* Default .blend only contains one workspace ("General").
* Support appending workspaces.
Opening files without UI and commandline rendering should work fine.
Note that the UI is temporary! We plan to introduce a new global topbar
that contains the workspace options and tabs for switching workspaces.
== Technical Notes
* Workspaces are data-blocks.
* Adding and removing `bScreen`s should be done through `ED_workspace_layout` API now.
* A workspace can be active in multiple windows at the same time.
* The mode menu (which is now in the Info Editor header) doesn't display "Grease Pencil Edit" mode anymore since its availability depends on the active editor. Will be fixed by making Grease Pencil an own object type (as planned).
* The button to change the active workspace object mode may get out of sync with the mode of the active object. Will either be resolved by moving mode out of object data, or we'll disable workspace modes again (there's a `#define USE_WORKSPACE_MODE` for that).
* Screen-layouts (`bScreen`) are IDs and thus stored in a main list-base. Had to add a wrapper `WorkSpaceLayout` so we can store them in a list-base within workspaces, too. On the long run we could completely replace `bScreen` by workspace structs.
* `WorkSpace` types use some special compiler trickery to allow marking structs and struct members as private. BKE_workspace API should be used for accessing those.
* Added scene operators `SCENE_OT_`. Was previously done through screen operators.
== BPY API Changes
* Removed `Screen.scene`, added `Window.scene`
* Removed `UserPreferencesView.use_global_scene`
* Added `Context.workspace`, `Window.workspace` and `BlendData.workspaces`
* Added `bpy.types.WorkSpace` containing `screens`, `object_mode` and `render_layer`
* Added Screen.layout_name for the layout name that'll be displayed in the UI (may differ from internal name)
== What's left?
* There are a few open design questions (T50521). We should find the needed answers and implement them.
* Allow adding and removing individual workspaces from workspace configuration (needs UI design).
* Get the override system ready and support overrides per workspace.
* Support custom UI setups as part of workspaces (hidden panels, hidden buttons, customizable toolbars, etc).
* Allow enabling add-ons per workspace.
* Support custom workspace keymaps.
* Remove special exception for workspaces in linking code (so they're always appended, never linked). Depends on a few things, so best to solve later.
* Get the topbar done.
* Workspaces need a proper icon, current one is just a placeholder :)
Reviewed By: campbellbarton, mont29
Tags: #user_interface, #bf_blender_2.8
Maniphest Tasks: T50521
Differential Revision: https://developer.blender.org/D2451
2017-06-01 19:56:58 +02:00
|
|
|
for (sa_iter = screen->areabase.first; sa_iter; sa_iter = sa_iter->next) {
|
2015-07-12 22:57:35 +10:00
|
|
|
ARegion *ar_iter;
|
2015-07-13 00:21:08 +10:00
|
|
|
CTX_wm_area_set(C, sa_iter);
|
2015-07-12 22:57:35 +10:00
|
|
|
|
2015-07-13 00:21:08 +10:00
|
|
|
for (ar_iter = sa_iter->regionbase.first; ar_iter; ar_iter = ar_iter->next) {
|
2018-02-16 22:41:46 +01:00
|
|
|
if (ar_iter->visible) {
|
2015-07-12 22:57:35 +10:00
|
|
|
CTX_wm_region_set(C, ar_iter);
|
|
|
|
ED_region_do_draw(C, ar_iter);
|
2015-07-13 00:21:08 +10:00
|
|
|
ar_iter->do_draw = false;
|
2009-09-22 09:12:39 +00:00
|
|
|
}
|
|
|
|
}
|
2015-07-12 22:57:35 +10:00
|
|
|
}
|
2009-09-22 09:12:39 +00:00
|
|
|
|
2015-07-12 22:57:35 +10:00
|
|
|
CTX_wm_window_set(C, win); /* XXX context manipulation warning! */
|
|
|
|
|
2015-07-13 00:21:08 +10:00
|
|
|
CTX_wm_area_set(C, sa);
|
|
|
|
CTX_wm_region_set(C, ar);
|
2015-07-12 22:57:35 +10:00
|
|
|
}
|
|
|
|
else if (type == eRTDrawWindowSwap) {
|
|
|
|
redraw_timer_window_swap(C);
|
|
|
|
}
|
|
|
|
else if (type == eRTAnimationStep) {
|
|
|
|
scene->r.cfra += (cfra == scene->r.cfra) ? 1 : -1;
|
2018-04-06 11:21:20 +02:00
|
|
|
BKE_scene_graph_update_for_newframe(depsgraph, bmain);
|
2015-07-12 22:57:35 +10:00
|
|
|
}
|
|
|
|
else if (type == eRTAnimationPlay) {
|
|
|
|
/* play anim, return on same frame as started with */
|
|
|
|
int tot = (scene->r.efra - scene->r.sfra) + 1;
|
|
|
|
|
|
|
|
while (tot--) {
|
|
|
|
/* todo, ability to escape! */
|
|
|
|
scene->r.cfra++;
|
|
|
|
if (scene->r.cfra > scene->r.efra)
|
|
|
|
scene->r.cfra = scene->r.sfra;
|
2009-09-22 09:12:39 +00:00
|
|
|
|
2018-04-06 11:21:20 +02:00
|
|
|
BKE_scene_graph_update_for_newframe(depsgraph, bmain);
|
2015-07-12 22:57:35 +10:00
|
|
|
redraw_timer_window_swap(C);
|
2009-05-19 15:37:50 +00:00
|
|
|
}
|
2015-07-12 22:57:35 +10:00
|
|
|
}
|
|
|
|
else { /* eRTUndo */
|
|
|
|
ED_undo_pop(C);
|
|
|
|
ED_undo_redo(C);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int redraw_timer_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
Scene *scene = CTX_data_scene(C);
|
|
|
|
wmWindow *win = CTX_wm_window(C);
|
2015-07-13 00:21:08 +10:00
|
|
|
ScrArea *sa = CTX_wm_area(C);
|
2015-07-12 22:57:35 +10:00
|
|
|
ARegion *ar = CTX_wm_region(C);
|
|
|
|
double time_start, time_delta;
|
|
|
|
const int type = RNA_enum_get(op->ptr, "type");
|
|
|
|
const int iter = RNA_int_get(op->ptr, "iterations");
|
|
|
|
const double time_limit = (double)RNA_float_get(op->ptr, "time_limit");
|
|
|
|
const int cfra = scene->r.cfra;
|
|
|
|
int a, iter_steps = 0;
|
|
|
|
const char *infostr = "";
|
2017-11-03 14:36:49 +01:00
|
|
|
struct Depsgraph *depsgraph = CTX_data_depsgraph(C);
|
2015-07-12 22:57:35 +10:00
|
|
|
|
|
|
|
WM_cursor_wait(1);
|
2010-06-14 10:33:26 +00:00
|
|
|
|
2015-07-12 22:57:35 +10:00
|
|
|
time_start = PIL_check_seconds_timer();
|
2010-06-14 10:33:26 +00:00
|
|
|
|
2015-07-12 22:57:35 +10:00
|
|
|
for (a = 0; a < iter; a++) {
|
2018-04-06 11:21:20 +02:00
|
|
|
redraw_timer_step(C, bmain, scene, depsgraph, win, sa, ar, type, cfra);
|
2015-07-12 22:57:35 +10:00
|
|
|
iter_steps += 1;
|
2010-06-14 10:33:26 +00:00
|
|
|
|
2015-07-25 13:26:20 +10:00
|
|
|
if (time_limit != 0.0) {
|
2015-07-12 22:57:35 +10:00
|
|
|
if ((PIL_check_seconds_timer() - time_start) > time_limit) {
|
|
|
|
break;
|
2010-06-14 10:33:26 +00:00
|
|
|
}
|
2015-07-12 22:57:35 +10:00
|
|
|
a = 0;
|
2009-05-19 12:54:54 +00:00
|
|
|
}
|
|
|
|
}
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2015-07-13 00:21:08 +10:00
|
|
|
time_delta = (PIL_check_seconds_timer() - time_start) * 1000;
|
2010-06-14 10:33:26 +00:00
|
|
|
|
|
|
|
RNA_enum_description(redraw_timer_type_items, type, &infostr);
|
|
|
|
|
2009-05-19 12:54:54 +00:00
|
|
|
WM_cursor_wait(0);
|
2010-06-14 10:33:26 +00:00
|
|
|
|
2015-07-12 22:57:35 +10:00
|
|
|
BKE_reportf(op->reports, RPT_WARNING,
|
2015-07-13 00:21:08 +10:00
|
|
|
"%d x %s: %.4f ms, average: %.8f ms",
|
2015-07-12 22:57:35 +10:00
|
|
|
iter_steps, infostr, time_delta, time_delta / iter_steps);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2009-05-19 12:54:54 +00:00
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
2009-09-22 09:12:39 +00:00
|
|
|
static void WM_OT_redraw_timer(wmOperatorType *ot)
|
2009-05-19 12:54:54 +00:00
|
|
|
{
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Redraw Timer";
|
|
|
|
ot->idname = "WM_OT_redraw_timer";
|
|
|
|
ot->description = "Simple redraw timer to test the speed of updating the interface";
|
2010-06-14 10:33:26 +00:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->invoke = WM_menu_invoke;
|
|
|
|
ot->exec = redraw_timer_exec;
|
|
|
|
ot->poll = WM_operator_winactive;
|
2010-06-14 10:33:26 +00:00
|
|
|
|
2015-06-23 12:53:33 +02:00
|
|
|
ot->prop = RNA_def_enum(ot->srna, "type", redraw_timer_type_items, eRTDrawRegion, "Type", "");
|
2012-03-27 01:24:16 +00:00
|
|
|
RNA_def_int(ot->srna, "iterations", 10, 1, INT_MAX, "Iterations", "Number of times to redraw", 1, 1000);
|
2015-07-12 22:57:35 +10:00
|
|
|
RNA_def_float(ot->srna, "time_limit", 0.0, 0.0, FLT_MAX,
|
|
|
|
"Time Limit", "Seconds to run the test for (override iterations)", 0.0, 60.0);
|
2009-05-19 12:54:54 +00:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-10-27 10:29:51 +00:00
|
|
|
/* ************************** memory statistics for testing ***************** */
|
2009-05-19 12:54:54 +00:00
|
|
|
|
2010-10-16 02:40:31 +00:00
|
|
|
static int memory_statistics_exec(bContext *UNUSED(C), wmOperator *UNUSED(op))
|
2009-10-27 10:29:51 +00:00
|
|
|
{
|
|
|
|
MEM_printmemlist_stats();
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void WM_OT_memory_statistics(wmOperatorType *ot)
|
|
|
|
{
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->name = "Memory Statistics";
|
|
|
|
ot->idname = "WM_OT_memory_statistics";
|
|
|
|
ot->description = "Print memory statistics to the console";
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-03-22 07:26:09 +00:00
|
|
|
ot->exec = memory_statistics_exec;
|
2009-10-27 10:29:51 +00:00
|
|
|
}
|
2009-05-19 12:54:54 +00:00
|
|
|
|
2015-01-12 14:44:54 +01:00
|
|
|
/* *************************** Mat/tex/etc. previews generation ************* */
|
|
|
|
|
2016-03-24 16:10:05 +01:00
|
|
|
typedef struct PreviewsIDEnsureData {
|
2015-06-12 09:55:04 +02:00
|
|
|
bContext *C;
|
2015-01-12 14:44:54 +01:00
|
|
|
Scene *scene;
|
2016-03-24 16:10:05 +01:00
|
|
|
} PreviewsIDEnsureData;
|
2015-01-12 14:44:54 +01:00
|
|
|
|
|
|
|
static void previews_id_ensure(bContext *C, Scene *scene, ID *id)
|
|
|
|
{
|
|
|
|
BLI_assert(ELEM(GS(id->name), ID_MA, ID_TE, ID_IM, ID_WO, ID_LA));
|
|
|
|
|
|
|
|
/* Only preview non-library datablocks, lib ones do not pertain to this .blend file!
|
|
|
|
* Same goes for ID with no user. */
|
2017-11-06 17:17:10 +01:00
|
|
|
if (!ID_IS_LINKED(id) && (id->us != 0)) {
|
2015-01-12 14:44:54 +01:00
|
|
|
UI_id_icon_render(C, scene, id, false, false);
|
|
|
|
UI_id_icon_render(C, scene, id, true, false);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-31 10:41:25 +01:00
|
|
|
static int previews_id_ensure_callback(void *userdata, ID *UNUSED(self_id), ID **idptr, int cb_flag)
|
2015-01-12 14:44:54 +01:00
|
|
|
{
|
2017-01-31 10:41:25 +01:00
|
|
|
if (cb_flag & IDWALK_CB_PRIVATE) {
|
2017-01-30 21:34:23 +01:00
|
|
|
return IDWALK_RET_NOP;
|
|
|
|
}
|
|
|
|
|
2016-03-24 16:10:05 +01:00
|
|
|
PreviewsIDEnsureData *data = userdata;
|
2015-01-12 14:44:54 +01:00
|
|
|
ID *id = *idptr;
|
|
|
|
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
if (id && (id->tag & LIB_TAG_DOIT)) {
|
2016-03-24 16:10:05 +01:00
|
|
|
BLI_assert(ELEM(GS(id->name), ID_MA, ID_TE, ID_IM, ID_WO, ID_LA));
|
|
|
|
previews_id_ensure(data->C, data->scene, id);
|
|
|
|
id->tag &= ~LIB_TAG_DOIT;
|
2015-01-12 14:44:54 +01:00
|
|
|
}
|
|
|
|
|
2016-03-24 12:28:41 +01:00
|
|
|
return IDWALK_RET_NOP;
|
2015-01-12 14:44:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static int previews_ensure_exec(bContext *C, wmOperator *UNUSED(op))
|
|
|
|
{
|
|
|
|
Main *bmain = CTX_data_main(C);
|
|
|
|
ListBase *lb[] = {&bmain->mat, &bmain->tex, &bmain->image, &bmain->world, &bmain->lamp, NULL};
|
2016-03-24 16:10:05 +01:00
|
|
|
PreviewsIDEnsureData preview_id_data;
|
2015-01-12 14:44:54 +01:00
|
|
|
Scene *scene;
|
|
|
|
ID *id;
|
|
|
|
int i;
|
|
|
|
|
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
2015-12-27 11:53:50 +01:00
|
|
|
/* We use LIB_TAG_DOIT to check whether we have already handled a given ID or not. */
|
2016-03-24 16:10:05 +01:00
|
|
|
BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false);
|
|
|
|
for (i = 0; lb[i]; i++) {
|
|
|
|
BKE_main_id_tag_listbase(lb[i], LIB_TAG_DOIT, true);
|
|
|
|
}
|
2015-01-12 14:44:54 +01:00
|
|
|
|
2016-03-24 16:10:05 +01:00
|
|
|
preview_id_data.C = C;
|
2015-01-12 14:44:54 +01:00
|
|
|
for (scene = bmain->scene.first; scene; scene = scene->id.next) {
|
2016-03-24 16:10:05 +01:00
|
|
|
preview_id_data.scene = scene;
|
2015-01-12 14:44:54 +01:00
|
|
|
id = (ID *)scene;
|
|
|
|
|
2017-01-30 21:41:44 +01:00
|
|
|
BKE_library_foreach_ID_link(NULL, id, previews_id_ensure_callback, &preview_id_data, IDWALK_RECURSE);
|
2015-01-12 14:44:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Check a last time for ID not used (fake users only, in theory), and
|
|
|
|
* do our best for those, using current scene... */
|
|
|
|
for (i = 0; lb[i]; i++) {
|
|
|
|
for (id = lb[i]->first; id; id = id->next) {
|
2016-03-24 16:10:05 +01:00
|
|
|
if (id->tag & LIB_TAG_DOIT) {
|
|
|
|
previews_id_ensure(C, NULL, id);
|
|
|
|
id->tag &= ~LIB_TAG_DOIT;
|
|
|
|
}
|
2015-01-12 14:44:54 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void WM_OT_previews_ensure(wmOperatorType *ot)
|
|
|
|
{
|
2016-09-19 16:46:20 +02:00
|
|
|
ot->name = "Refresh Data-Block Previews";
|
2015-01-12 14:44:54 +01:00
|
|
|
ot->idname = "WM_OT_previews_ensure";
|
2016-09-19 16:46:20 +02:00
|
|
|
ot->description = "Ensure data-block previews are available and up-to-date "
|
2015-01-12 14:44:54 +01:00
|
|
|
"(to be saved in .blend file, only for some types like materials, textures, etc.)";
|
|
|
|
|
|
|
|
ot->exec = previews_ensure_exec;
|
|
|
|
}
|
|
|
|
|
2015-08-10 17:26:37 +02:00
|
|
|
/* *************************** Datablocks previews clear ************* */
|
|
|
|
|
|
|
|
/* Only types supporting previews currently. */
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem preview_id_type_items[] = {
|
2015-08-10 17:26:37 +02:00
|
|
|
{FILTER_ID_SCE, "SCENE", 0, "Scenes", ""},
|
|
|
|
{FILTER_ID_GR, "GROUP", 0, "Groups", ""},
|
2015-09-02 18:39:19 +10:00
|
|
|
{FILTER_ID_OB, "OBJECT", 0, "Objects", ""},
|
2015-08-10 17:26:37 +02:00
|
|
|
{FILTER_ID_MA, "MATERIAL", 0, "Materials", ""},
|
2018-06-27 14:41:53 +02:00
|
|
|
{FILTER_ID_LA, "LIGHT", 0, "Lights", ""},
|
2015-08-10 17:26:37 +02:00
|
|
|
{FILTER_ID_WO, "WORLD", 0, "Worlds", ""},
|
|
|
|
{FILTER_ID_TE, "TEXTURE", 0, "Textures", ""},
|
|
|
|
{FILTER_ID_IM, "IMAGE", 0, "Images", ""},
|
|
|
|
#if 0 /* XXX TODO */
|
|
|
|
{FILTER_ID_BR, "BRUSH", 0, "Brushes", ""},
|
|
|
|
#endif
|
|
|
|
{0, NULL, 0, NULL, NULL}
|
|
|
|
};
|
|
|
|
|
|
|
|
static int previews_clear_exec(bContext *C, wmOperator *op)
|
|
|
|
{
|
|
|
|
Main *bmain = CTX_data_main(C);
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
ListBase *lb[] = {&bmain->object, &bmain->collection,
|
2015-08-10 17:26:37 +02:00
|
|
|
&bmain->mat, &bmain->world, &bmain->lamp, &bmain->tex, &bmain->image, NULL};
|
|
|
|
int i;
|
|
|
|
|
|
|
|
const int id_filters = RNA_enum_get(op->ptr, "id_type");
|
|
|
|
|
|
|
|
for (i = 0; lb[i]; i++) {
|
|
|
|
ID *id = lb[i]->first;
|
|
|
|
|
|
|
|
if (!id) continue;
|
|
|
|
|
|
|
|
// printf("%s: %d, %d, %d -> %d\n", id->name, GS(id->name), BKE_idcode_to_idfilter(GS(id->name)),
|
|
|
|
// id_filters, BKE_idcode_to_idfilter(GS(id->name)) & id_filters);
|
|
|
|
|
|
|
|
if (!id || !(BKE_idcode_to_idfilter(GS(id->name)) & id_filters)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (; id; id = id->next) {
|
|
|
|
PreviewImage *prv_img = BKE_previewimg_id_ensure(id);
|
|
|
|
|
|
|
|
BKE_previewimg_clear(prv_img);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return OPERATOR_FINISHED;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void WM_OT_previews_clear(wmOperatorType *ot)
|
|
|
|
{
|
2016-09-19 16:46:20 +02:00
|
|
|
ot->name = "Clear Data-Block Previews";
|
2015-08-10 17:26:37 +02:00
|
|
|
ot->idname = "WM_OT_previews_clear";
|
2016-09-19 16:46:20 +02:00
|
|
|
ot->description = "Clear data-block previews (only for some types like objects, materials, textures, etc.)";
|
2015-08-10 17:26:37 +02:00
|
|
|
|
|
|
|
ot->exec = previews_clear_exec;
|
|
|
|
ot->invoke = WM_menu_invoke;
|
|
|
|
|
|
|
|
ot->prop = RNA_def_enum_flag(ot->srna, "id_type", preview_id_type_items,
|
|
|
|
FILTER_ID_SCE | FILTER_ID_OB | FILTER_ID_GR |
|
2016-01-21 09:05:52 +11:00
|
|
|
FILTER_ID_MA | FILTER_ID_LA | FILTER_ID_WO | FILTER_ID_TE | FILTER_ID_IM,
|
2016-09-19 16:46:20 +02:00
|
|
|
"Data-Block Type", "Which data-block previews to clear");
|
2015-08-10 17:26:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* *************************** Doc from UI ************* */
|
|
|
|
|
2015-04-27 01:17:51 +10:00
|
|
|
static int doc_view_manual_ui_context_exec(bContext *C, wmOperator *UNUSED(op))
|
|
|
|
{
|
|
|
|
PointerRNA ptr_props;
|
|
|
|
char buf[512];
|
|
|
|
short retval = OPERATOR_CANCELLED;
|
|
|
|
|
|
|
|
if (UI_but_online_manual_id_from_active(C, buf, sizeof(buf))) {
|
|
|
|
WM_operator_properties_create(&ptr_props, "WM_OT_doc_view_manual");
|
|
|
|
RNA_string_set(&ptr_props, "doc_id", buf);
|
|
|
|
|
|
|
|
retval = WM_operator_name_call_ptr(
|
|
|
|
C, WM_operatortype_find("WM_OT_doc_view_manual", false),
|
|
|
|
WM_OP_EXEC_DEFAULT, &ptr_props);
|
|
|
|
|
|
|
|
WM_operator_properties_free(&ptr_props);
|
|
|
|
}
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void WM_OT_doc_view_manual_ui_context(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
/* identifiers */
|
|
|
|
ot->name = "View Online Manual";
|
|
|
|
ot->idname = "WM_OT_doc_view_manual_ui_context";
|
2015-04-27 20:10:32 +02:00
|
|
|
ot->description = "View a context based online manual in a web browser";
|
2015-04-27 01:17:51 +10:00
|
|
|
|
|
|
|
/* callbacks */
|
|
|
|
ot->poll = ED_operator_regionactive;
|
|
|
|
ot->exec = doc_view_manual_ui_context_exec;
|
|
|
|
}
|
|
|
|
|
2015-04-06 10:40:12 -03:00
|
|
|
/* ******************************************************* */
|
|
|
|
/* toggle 3D for current window, turning it fullscreen if needed */
|
|
|
|
static void WM_OT_stereo3d_set(wmOperatorType *ot)
|
|
|
|
{
|
|
|
|
PropertyRNA *prop;
|
|
|
|
|
|
|
|
ot->name = "Set Stereo 3D";
|
|
|
|
ot->idname = "WM_OT_set_stereo_3d";
|
|
|
|
ot->description = "Toggle 3D stereo support for current window (or change the display mode)";
|
|
|
|
|
|
|
|
ot->exec = wm_stereo3d_set_exec;
|
|
|
|
ot->invoke = wm_stereo3d_set_invoke;
|
|
|
|
ot->poll = WM_operator_winactive;
|
|
|
|
ot->ui = wm_stereo3d_set_draw;
|
2015-04-07 15:42:44 -03:00
|
|
|
ot->check = wm_stereo3d_set_check;
|
2015-04-06 10:40:12 -03:00
|
|
|
ot->cancel = wm_stereo3d_set_cancel;
|
|
|
|
|
2015-11-23 13:49:52 +11:00
|
|
|
prop = RNA_def_enum(ot->srna, "display_mode", rna_enum_stereo3d_display_items, S3D_DISPLAY_ANAGLYPH, "Display Mode", "");
|
2015-04-06 10:40:12 -03:00
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2015-11-23 13:49:52 +11:00
|
|
|
prop = RNA_def_enum(ot->srna, "anaglyph_type", rna_enum_stereo3d_anaglyph_type_items, S3D_ANAGLYPH_REDCYAN, "Anaglyph Type", "");
|
2015-04-06 10:40:12 -03:00
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
2015-11-23 13:49:52 +11:00
|
|
|
prop = RNA_def_enum(ot->srna, "interlace_type", rna_enum_stereo3d_interlace_type_items, S3D_INTERLACE_ROW, "Interlace Type", "");
|
2015-04-06 10:40:12 -03:00
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
|
|
|
prop = RNA_def_boolean(ot->srna, "use_interlace_swap", false, "Swap Left/Right",
|
|
|
|
"Swap left and right stereo channels");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
|
|
|
prop = RNA_def_boolean(ot->srna, "use_sidebyside_crosseyed", false, "Cross-Eyed",
|
|
|
|
"Right eye should see left image and vice-versa");
|
|
|
|
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
|
|
|
|
}
|
|
|
|
|
2018-07-13 12:15:18 +02:00
|
|
|
void wm_operatortypes_register(void)
|
2007-12-24 18:27:28 +00:00
|
|
|
{
|
2015-10-20 15:41:13 +11:00
|
|
|
WM_operatortype_append(WM_OT_window_close);
|
2017-03-13 10:43:49 +01:00
|
|
|
WM_operatortype_append(WM_OT_window_new);
|
2018-07-03 15:34:26 +02:00
|
|
|
WM_operatortype_append(WM_OT_window_new_main);
|
2013-03-28 02:29:10 +00:00
|
|
|
WM_operatortype_append(WM_OT_read_history);
|
2009-02-07 10:00:46 +00:00
|
|
|
WM_operatortype_append(WM_OT_read_homefile);
|
2010-10-02 13:45:26 +00:00
|
|
|
WM_operatortype_append(WM_OT_read_factory_settings);
|
2.5 Branch
==========
* Changed wmOperatorType, removing init/exit callbacks and adding cancel
callback, removed default storage in favor of properties. Defined return
values for exec/invoke/modal/cancel.
* Don't allocate operator on the stack, and removed operator copy for
handlers. Now it frees based on return values from callbacks, and just
keeps a wmOperator on the heap. Also it now registers after the operator
is fully finished, to get the correct final properties.
* Changed OP_get_* functions to return 1 if the property is found and 0
otherwise, gives more readable code in my opinion. Added OP_verify_*
functions to quickly check if the property is available and set if it's
not, that's common for exec/invoke.
* Removed WM_operatortypelist_append in favor of WM_operatortype_append
which takes a function pointer instead of a list, avoids macro's and
duplicating code.
* Fix a crash where the handler would still be used while it was freed by
the operator.
* Spacetypes now have operatortypes() and keymap() callbacks to abstract
them a bit more.
* Renamed C->curarea to C->area for consistency. Removed View3D/View2D/
SpaceIpo from bContext, seems bad to keep these.
* Set context variables like window/screen/area/region to NULL again when
leaving that context, instead of leaving the pointers there.
* Added if(G.f & G_DEBUG) for many of the prints, makes output a bit
cleaner and easier to debug.
* Fixed priority of the editors/interface module in scons, would otherwise
give link errors.
* Added start of generic view2d api.
* Added space_time with some basic drawing and a single operator to change
the frame.
2008-06-11 10:10:31 +00:00
|
|
|
WM_operatortype_append(WM_OT_save_homefile);
|
Holiday coding log :)
Nice formatted version (pictures soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.66/Usability
Short list of main changes:
- Transparent region option (over main region), added code to blend in/out such panels.
- Min size window now 640 x 480
- Fixed DPI for ui - lots of cleanup and changes everywhere. Icon image need correct size still, layer-in-use icon needs remake.
- Macbook retina support, use command line --no-native-pixels to disable it
- Timeline Marker label was drawing wrong
- Trackpad and magic mouse: supports zoom (hold ctrl)
- Fix for splash position: removed ghost function and made window size update after creation immediate
- Fast undo buffer save now adds UI as well. Could be checked for regular file save even...
Quit.blend and temp file saving use this now.
- Dixed filename in window on reading quit.blend or temp saves, and they now add a warning in window title: "(Recovered)"
- New Userpref option "Keep Session" - this always saves quit.blend, and loads on start.
This allows keeping UI and data without actual saves, until you actually save.
When you load startup.blend and quit, it recognises the quit.blend as a startup (no file name in header)
- Added 3D view copy/paste buffers (selected objects). Shortcuts ctrl-c, ctrl-v (OSX, cmd-c, cmd-v).
Coded partial file saving for it. Could be used for other purposes. Todo: use OS clipboards.
- User preferences (themes, keymaps, user settings) now can be saved as a separate file.
Old option is called "Save Startup File" the new one "Save User Settings".
To visualise this difference, the 'save startup file' button has been removed from user preferences window. That option is available as CTRL+U and in File menu still.
- OSX: fixed bug that stopped giving mouse events outside window.
This also fixes "Continuous Grab" for OSX. (error since 2009)
2012-12-12 18:58:11 +00:00
|
|
|
WM_operatortype_append(WM_OT_save_userpref);
|
2013-06-18 18:11:52 +00:00
|
|
|
WM_operatortype_append(WM_OT_userpref_autoexec_path_add);
|
|
|
|
WM_operatortype_append(WM_OT_userpref_autoexec_path_remove);
|
2.5 Branch
==========
* Changed wmOperatorType, removing init/exit callbacks and adding cancel
callback, removed default storage in favor of properties. Defined return
values for exec/invoke/modal/cancel.
* Don't allocate operator on the stack, and removed operator copy for
handlers. Now it frees based on return values from callbacks, and just
keeps a wmOperator on the heap. Also it now registers after the operator
is fully finished, to get the correct final properties.
* Changed OP_get_* functions to return 1 if the property is found and 0
otherwise, gives more readable code in my opinion. Added OP_verify_*
functions to quickly check if the property is available and set if it's
not, that's common for exec/invoke.
* Removed WM_operatortypelist_append in favor of WM_operatortype_append
which takes a function pointer instead of a list, avoids macro's and
duplicating code.
* Fix a crash where the handler would still be used while it was freed by
the operator.
* Spacetypes now have operatortypes() and keymap() callbacks to abstract
them a bit more.
* Renamed C->curarea to C->area for consistency. Removed View3D/View2D/
SpaceIpo from bContext, seems bad to keep these.
* Set context variables like window/screen/area/region to NULL again when
leaving that context, instead of leaving the pointers there.
* Added if(G.f & G_DEBUG) for many of the prints, makes output a bit
cleaner and easier to debug.
* Fixed priority of the editors/interface module in scons, would otherwise
give link errors.
* Added start of generic view2d api.
* Added space_time with some basic drawing and a single operator to change
the frame.
2008-06-11 10:10:31 +00:00
|
|
|
WM_operatortype_append(WM_OT_window_fullscreen_toggle);
|
2010-10-11 22:05:45 +00:00
|
|
|
WM_operatortype_append(WM_OT_quit_blender);
|
2009-01-06 14:42:54 +00:00
|
|
|
WM_operatortype_append(WM_OT_open_mainfile);
|
2014-01-29 05:34:57 +11:00
|
|
|
WM_operatortype_append(WM_OT_revert_mainfile);
|
2014-09-04 19:35:18 +02:00
|
|
|
WM_operatortype_append(WM_OT_link);
|
|
|
|
WM_operatortype_append(WM_OT_append);
|
2016-06-22 18:05:55 +02:00
|
|
|
WM_operatortype_append(WM_OT_lib_relocate);
|
|
|
|
WM_operatortype_append(WM_OT_lib_reload);
|
2009-07-23 21:35:11 +00:00
|
|
|
WM_operatortype_append(WM_OT_recover_last_session);
|
2009-10-20 13:58:53 +00:00
|
|
|
WM_operatortype_append(WM_OT_recover_auto_save);
|
2009-01-21 19:28:28 +00:00
|
|
|
WM_operatortype_append(WM_OT_save_as_mainfile);
|
2009-02-08 19:15:59 +00:00
|
|
|
WM_operatortype_append(WM_OT_save_mainfile);
|
2009-09-22 09:12:39 +00:00
|
|
|
WM_operatortype_append(WM_OT_redraw_timer);
|
2009-10-27 10:29:51 +00:00
|
|
|
WM_operatortype_append(WM_OT_memory_statistics);
|
2009-05-22 15:02:32 +00:00
|
|
|
WM_operatortype_append(WM_OT_debug_menu);
|
2012-11-12 21:44:48 +00:00
|
|
|
WM_operatortype_append(WM_OT_operator_defaults);
|
2009-11-23 13:58:55 +00:00
|
|
|
WM_operatortype_append(WM_OT_splash);
|
2009-06-03 18:31:37 +00:00
|
|
|
WM_operatortype_append(WM_OT_search_menu);
|
2009-10-06 13:04:31 +00:00
|
|
|
WM_operatortype_append(WM_OT_call_menu);
|
Pie Menus C code backend.
This commit merges the code in the pie-menu branch.
As per decisions taken the last few days, there are no pie menus
included and there will be an official add-on including overrides of
some keys with pie menus. However, people will now be able to use the
new code in python.
Full Documentation is in http://wiki.blender.org/index.php/Dev:Ref/
Thanks:
Campbell Barton, Dalai Felinto and Ton Roosendaal for the code review
and design comments
Jonathan Williamson, Pawel Lyczkowski, Pablo Vazquez among others for
suggestions during the development.
Special Thanks to Sean Olson, for his support, suggestions, testing and
merciless bugging so that I would finish the pie menu code. Without him
we wouldn't be here. Also to the rest of the developers of the original
python add-on, Patrick Moore and Dan Eicher and finally to Matt Ebb, who
did the research and first implementation and whose code I used to get
started.
2014-08-11 10:39:59 +02:00
|
|
|
WM_operatortype_append(WM_OT_call_menu_pie);
|
2018-05-23 19:46:40 +02:00
|
|
|
WM_operatortype_append(WM_OT_call_panel);
|
2011-05-12 01:57:47 +00:00
|
|
|
WM_operatortype_append(WM_OT_radial_control);
|
2015-04-06 10:40:12 -03:00
|
|
|
WM_operatortype_append(WM_OT_stereo3d_set);
|
2010-11-11 20:32:28 +00:00
|
|
|
#if defined(WIN32)
|
2011-04-06 12:30:07 +00:00
|
|
|
WM_operatortype_append(WM_OT_console_toggle);
|
2010-10-18 20:41:52 +00:00
|
|
|
#endif
|
2015-01-12 14:44:54 +01:00
|
|
|
WM_operatortype_append(WM_OT_previews_ensure);
|
2015-08-10 17:26:37 +02:00
|
|
|
WM_operatortype_append(WM_OT_previews_clear);
|
2015-04-27 01:17:51 +10:00
|
|
|
WM_operatortype_append(WM_OT_doc_view_manual_ui_context);
|
2016-10-07 16:34:55 +02:00
|
|
|
|
2018-07-14 23:49:00 +02:00
|
|
|
/* gizmos */
|
|
|
|
WM_operatortype_append(GIZMOGROUP_OT_gizmo_select);
|
|
|
|
WM_operatortype_append(GIZMOGROUP_OT_gizmo_tweak);
|
2007-12-24 18:27:28 +00:00
|
|
|
}
|
|
|
|
|
2010-04-02 03:52:44 +00:00
|
|
|
/* circleselect-like modal operators */
|
2009-11-05 17:32:06 +00:00
|
|
|
static void gesture_circle_modal_keymap(wmKeyConfig *keyconf)
|
|
|
|
{
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem modal_items[] = {
|
2012-03-27 01:24:16 +00:00
|
|
|
{GESTURE_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
|
|
|
|
{GESTURE_MODAL_CONFIRM, "CONFIRM", 0, "Confirm", ""},
|
|
|
|
{GESTURE_MODAL_CIRCLE_ADD, "ADD", 0, "Add", ""},
|
|
|
|
{GESTURE_MODAL_CIRCLE_SUB, "SUBTRACT", 0, "Subtract", ""},
|
2013-03-04 17:06:16 +00:00
|
|
|
{GESTURE_MODAL_CIRCLE_SIZE, "SIZE", 0, "Size", ""},
|
2009-11-05 17:32:06 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
{GESTURE_MODAL_SELECT, "SELECT", 0, "Select", ""},
|
|
|
|
{GESTURE_MODAL_DESELECT, "DESELECT", 0, "DeSelect", ""},
|
|
|
|
{GESTURE_MODAL_NOP, "NOP", 0, "No Operation", ""},
|
2009-11-05 17:32:06 +00:00
|
|
|
|
2012-06-12 22:05:33 +00:00
|
|
|
{0, NULL, 0, NULL, NULL}
|
|
|
|
};
|
2009-11-05 17:32:06 +00:00
|
|
|
|
2013-04-29 17:59:44 +00:00
|
|
|
/* WARNING - name is incorrect, use for non-3d views */
|
2012-03-27 01:24:16 +00:00
|
|
|
wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "View3D Gesture Circle");
|
2009-11-05 17:32:06 +00:00
|
|
|
|
|
|
|
/* this function is called for each spacetype, only needs to add map once */
|
2012-04-17 15:40:04 +00:00
|
|
|
if (keymap && keymap->modal_items) return;
|
2009-11-05 17:32:06 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
keymap = WM_modalkeymap_add(keyconf, "View3D Gesture Circle", modal_items);
|
2009-11-05 17:32:06 +00:00
|
|
|
|
|
|
|
/* assign map to operators */
|
|
|
|
WM_modalkeymap_assign(keymap, "VIEW3D_OT_select_circle");
|
2018-10-04 13:21:21 +10:00
|
|
|
WM_modalkeymap_assign(keymap, "UV_OT_select_circle");
|
2011-11-07 12:55:18 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "CLIP_OT_select_circle");
|
2012-06-04 16:42:58 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "MASK_OT_select_circle");
|
2013-11-06 19:21:42 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "NODE_OT_select_circle");
|
Grease Pencil - Storyboarding Features (merge from GPencil_EditStrokes branch)
This merge-commit brings in a number of new features and workflow/UI improvements for
working with Grease Pencil. While these were originally targetted at improving
the workflow for creating 3D storyboards in Blender using the Grease Pencil,
many of these changes should also prove useful in other workflows too.
The main highlights here are:
1) It is now possible to edit Grease Pencil strokes
- Use D Tab, or toggle the "Enable Editing" toggles in the Toolbar/Properties regions
to enter "Stroke Edit Mode". In this mode, many common editing tools will
operate on Grease Pencil stroke points instead.
- Tools implemented include Select, Select All/Border/Circle/Linked/More/Less,
Grab, Rotate, Scale, Bend, Shear, To Sphere, Mirror, Duplicate, Delete.
- Proportional Editing works when using the transform tools
2) Grease Pencil stroke settings can now be animated
NOTE: Currently drivers don't work, but if time allows, this may still be
added before the release.
3) Strokes can be drawn with "filled" interiors, using a separate set of
colour/opacity settings to the ones used for the lines themselves.
This makes use of OpenGL filled polys, which has the limitation of only
being able to fill convex shapes. Some artifacts may be visible on concave
shapes (e.g. pacman's mouth will be overdrawn)
4) "Volumetric Strokes" - An alternative drawing technique for stroke drawing
has been added which draws strokes as a series of screen-aligned discs.
While this was originally a partial experimental technique at getting better
quality 3D lines, the effects possible using this technique were interesting
enough to warrant making this a dedicated feature. Best results when partial
opacity and large stroke widths are used.
5) Improved Onion Skinning Support
- Different colours can be selected for the before/after ghosts. To do so,
enable the "colour wheel" toggle beside the Onion Skinning toggle, and set
the colours accordingly.
- Different numbers of ghosts can be shown before/after the current frame
6) Grease Pencil datablocks are now attached to the scene by default instead of
the active object.
- For a long time, the object-attachment has proved to be quite problematic
for users to keep track of. Now that this is done at scene level, it is
easier for most users to use.
- An exception for old files (and for any addons which may benefit from object
attachment instead), is that if the active object has a Grease Pencil datablock,
that will be used instead.
- It is not currently possible to choose object-attachment from the UI, but
it is simple to do this from the console instead, by doing:
context.active_object.grease_pencil = bpy.data.grease_pencil["blah"]
7) Various UI Cleanups
- The layers UI has been cleaned up to use a list instead of the nested-panels
design. Apart from saving space, this is also much nicer to look at now.
- The UI code is now all defined in Python. To support this, it has been necessary
to add some new context properties to make it easier to access these settings.
e.g. "gpencil_data" for the datablock
"active_gpencil_layer" and "active_gpencil_frame" for active data,
"editable_gpencil_strokes" for the strokes that can be edited
- The "stroke placement/alignment" settings (previously "Drawing Settings" at the
bottom of the Grease Pencil panel in the Properties Region) is now located in
the toolbar. These were more toolsettings than properties for how GPencil got drawn.
- "Use Sketching Sessions" has been renamed "Continuous Drawing", as per a
suggestion for an earlier discussion on developer.blender.org
- By default, the painting operator will wait for a mouse button to be pressed
before it starts creating the stroke. This is to make it easier to include
this operator in various toolbars/menus/etc. To get it immediately starting
(as when you hold down DKEy to draw), set "wait_for_input" to False.
- GPencil Layers can be rearranged in the "Grease Pencil" mode of the Action Editor
- Toolbar panels have been added to all the other editors which support these.
8) Pie menus for quick-access to tools
A set of experimental pie menus has been included for quick access to many
tools and settings. It is not necessary to use these to get things done,
but they have been designed to help make certain common tasks easier.
- Ctrl-D = The main pie menu. Reveals tools in a context sensitive and
spatially stable manner.
- D Q = "Quick Settings" pie. This allows quick access to the active
layer's settings. Notably, colours, thickness, and turning
onion skinning on/off.
2014-12-01 01:52:06 +13:00
|
|
|
WM_modalkeymap_assign(keymap, "GPENCIL_OT_select_circle");
|
2016-06-23 23:16:14 +12:00
|
|
|
WM_modalkeymap_assign(keymap, "GRAPH_OT_select_circle");
|
|
|
|
WM_modalkeymap_assign(keymap, "ACTION_OT_select_circle");
|
2009-11-05 17:32:06 +00:00
|
|
|
}
|
|
|
|
|
2010-04-04 00:21:37 +00:00
|
|
|
/* straight line modal operators */
|
|
|
|
static void gesture_straightline_modal_keymap(wmKeyConfig *keyconf)
|
|
|
|
{
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem modal_items[] = {
|
2012-03-27 01:24:16 +00:00
|
|
|
{GESTURE_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
|
|
|
|
{GESTURE_MODAL_SELECT, "SELECT", 0, "Select", ""},
|
|
|
|
{GESTURE_MODAL_BEGIN, "BEGIN", 0, "Begin", ""},
|
2012-06-12 22:05:33 +00:00
|
|
|
{0, NULL, 0, NULL, NULL}
|
|
|
|
};
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Gesture Straight Line");
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2010-04-04 00:21:37 +00:00
|
|
|
/* this function is called for each spacetype, only needs to add map once */
|
2012-04-17 15:40:04 +00:00
|
|
|
if (keymap && keymap->modal_items) return;
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
keymap = WM_modalkeymap_add(keyconf, "Gesture Straight Line", modal_items);
|
2018-06-07 16:43:52 +02:00
|
|
|
|
2010-04-04 00:21:37 +00:00
|
|
|
/* assign map to operators */
|
|
|
|
WM_modalkeymap_assign(keymap, "IMAGE_OT_sample_line");
|
2012-12-22 08:19:27 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "PAINT_OT_weight_gradient");
|
2013-08-29 18:45:04 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "MESH_OT_bisect");
|
2010-04-04 00:21:37 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2018-10-05 10:27:04 +10:00
|
|
|
/* box_select-like modal operators */
|
|
|
|
static void gesture_box_modal_keymap(wmKeyConfig *keyconf)
|
2009-11-06 22:51:08 +00:00
|
|
|
{
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem modal_items[] = {
|
2012-03-27 01:24:16 +00:00
|
|
|
{GESTURE_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
|
|
|
|
{GESTURE_MODAL_SELECT, "SELECT", 0, "Select", ""},
|
|
|
|
{GESTURE_MODAL_DESELECT, "DESELECT", 0, "DeSelect", ""},
|
|
|
|
{GESTURE_MODAL_BEGIN, "BEGIN", 0, "Begin", ""},
|
2012-06-12 22:05:33 +00:00
|
|
|
{0, NULL, 0, NULL, NULL}
|
|
|
|
};
|
2009-11-06 22:51:08 +00:00
|
|
|
|
2018-10-05 10:27:04 +10:00
|
|
|
wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Gesture Box");
|
2009-11-06 22:51:08 +00:00
|
|
|
|
|
|
|
/* this function is called for each spacetype, only needs to add map once */
|
2012-04-17 15:40:04 +00:00
|
|
|
if (keymap && keymap->modal_items) return;
|
2009-11-06 22:51:08 +00:00
|
|
|
|
2018-10-05 10:27:04 +10:00
|
|
|
keymap = WM_modalkeymap_add(keyconf, "Gesture Box", modal_items);
|
2009-11-06 22:51:08 +00:00
|
|
|
|
|
|
|
/* assign map to operators */
|
2018-10-05 10:27:04 +10:00
|
|
|
WM_modalkeymap_assign(keymap, "ACTION_OT_select_box");
|
|
|
|
WM_modalkeymap_assign(keymap, "ANIM_OT_channels_select_box");
|
2009-11-17 10:12:35 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "ANIM_OT_previewrange_set");
|
2018-10-05 10:27:04 +10:00
|
|
|
WM_modalkeymap_assign(keymap, "INFO_OT_select_box");
|
|
|
|
WM_modalkeymap_assign(keymap, "FILE_OT_select_box");
|
|
|
|
WM_modalkeymap_assign(keymap, "GRAPH_OT_select_box");
|
|
|
|
WM_modalkeymap_assign(keymap, "MARKER_OT_select_box");
|
|
|
|
WM_modalkeymap_assign(keymap, "NLA_OT_select_box");
|
|
|
|
WM_modalkeymap_assign(keymap, "NODE_OT_select_box");
|
2013-03-07 17:47:30 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "NODE_OT_viewer_border");
|
2012-03-14 06:32:43 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "PAINT_OT_hide_show");
|
2018-10-05 10:27:04 +10:00
|
|
|
WM_modalkeymap_assign(keymap, "OUTLINER_OT_select_box");
|
|
|
|
// WM_modalkeymap_assign(keymap, "SCREEN_OT_box_select"); // template
|
|
|
|
WM_modalkeymap_assign(keymap, "SEQUENCER_OT_select_box");
|
2010-07-08 10:03:29 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "SEQUENCER_OT_view_ghost_border");
|
2018-10-05 10:27:04 +10:00
|
|
|
WM_modalkeymap_assign(keymap, "UV_OT_select_box");
|
|
|
|
WM_modalkeymap_assign(keymap, "CLIP_OT_select_box");
|
|
|
|
WM_modalkeymap_assign(keymap, "CLIP_OT_graph_select_box");
|
|
|
|
WM_modalkeymap_assign(keymap, "MASK_OT_select_box");
|
2009-11-28 02:53:11 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "VIEW2D_OT_zoom_border");
|
2018-11-14 11:45:29 +01:00
|
|
|
// WM_modalkeymap_assign(keymap, "VIEW3D_OT_clip_border"); /* TODO */
|
2009-11-19 10:48:59 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "VIEW3D_OT_render_border");
|
2018-10-05 10:27:04 +10:00
|
|
|
WM_modalkeymap_assign(keymap, "VIEW3D_OT_select_box");
|
2012-10-20 20:20:02 +00:00
|
|
|
WM_modalkeymap_assign(keymap, "VIEW3D_OT_zoom_border"); /* XXX TODO: zoom border should perhaps map rightmouse to zoom out instead of in+cancel */
|
2014-10-08 18:02:49 +02:00
|
|
|
WM_modalkeymap_assign(keymap, "IMAGE_OT_render_border");
|
2016-05-07 04:22:48 +10:00
|
|
|
WM_modalkeymap_assign(keymap, "IMAGE_OT_view_zoom_border");
|
2018-10-05 10:27:04 +10:00
|
|
|
WM_modalkeymap_assign(keymap, "GPENCIL_OT_select_box");
|
2009-11-06 22:51:08 +00:00
|
|
|
}
|
|
|
|
|
2010-04-02 03:52:44 +00:00
|
|
|
/* zoom to border modal operators */
|
|
|
|
static void gesture_zoom_border_modal_keymap(wmKeyConfig *keyconf)
|
|
|
|
{
|
2017-10-18 15:07:26 +11:00
|
|
|
static const EnumPropertyItem modal_items[] = {
|
2012-03-27 01:24:16 +00:00
|
|
|
{GESTURE_MODAL_CANCEL, "CANCEL", 0, "Cancel", ""},
|
|
|
|
{GESTURE_MODAL_IN, "IN", 0, "In", ""},
|
|
|
|
{GESTURE_MODAL_OUT, "OUT", 0, "Out", ""},
|
|
|
|
{GESTURE_MODAL_BEGIN, "BEGIN", 0, "Begin", ""},
|
2012-06-12 22:05:33 +00:00
|
|
|
{0, NULL, 0, NULL, NULL}
|
|
|
|
};
|
2010-04-02 03:52:44 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
wmKeyMap *keymap = WM_modalkeymap_get(keyconf, "Gesture Zoom Border");
|
2010-04-02 03:52:44 +00:00
|
|
|
|
|
|
|
/* this function is called for each spacetype, only needs to add map once */
|
2012-04-17 15:40:04 +00:00
|
|
|
if (keymap && keymap->modal_items) return;
|
2010-04-02 03:52:44 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
keymap = WM_modalkeymap_add(keyconf, "Gesture Zoom Border", modal_items);
|
2010-04-02 03:52:44 +00:00
|
|
|
|
|
|
|
/* assign map to operators */
|
|
|
|
WM_modalkeymap_assign(keymap, "VIEW2D_OT_zoom_border");
|
|
|
|
WM_modalkeymap_assign(keymap, "VIEW3D_OT_zoom_border");
|
2016-05-07 04:22:48 +10:00
|
|
|
WM_modalkeymap_assign(keymap, "IMAGE_OT_view_zoom_border");
|
2010-04-02 03:52:44 +00:00
|
|
|
}
|
|
|
|
|
2008-11-19 16:28:11 +00:00
|
|
|
/* default keymap for windows and screens, only call once per WM */
|
Key Configuration
Keymaps are now saveable and configurable from the user preferences, note
that editing one item in a keymap means the whole keymap is now defined by
the user and will not be updated by Blender, an option for syncing might be
added later. The outliner interface is still there, but I will probably
remove it.
There's actually 3 levels now:
* Default builtin key configuration.
* Key configuration loaded from .py file, for configs like Blender 2.4x
or other 3D applications.
* Keymaps edited by the user and saved in .B.blend. These can be saved
to .py files as well to make creating distributable configurations
easier.
Also, user preferences sections were reorganized a bit, now there is:
Interface, Editing, Input, Files and System.
Implementation notes:
* wmKeyConfig was added which represents a key configuration containing
keymaps.
* wmKeymapItem was renamed to wmKeyMapItem for consistency with wmKeyMap.
* Modal maps are not wrapped yet.
* User preferences DNA file reading did not support newdataadr() yet,
added this now for reading keymaps.
* Key configuration related settings are now RNA wrapped.
* is_property_set and is_property_hidden python methods were added.
2009-10-08 18:40:03 +00:00
|
|
|
void wm_window_keymap(wmKeyConfig *keyconf)
|
2008-11-19 16:28:11 +00:00
|
|
|
{
|
2018-11-08 15:59:51 +11:00
|
|
|
WM_keymap_ensure(keyconf, "Window", 0, 0);
|
2009-11-05 17:32:06 +00:00
|
|
|
|
2018-07-14 23:49:00 +02:00
|
|
|
wm_gizmos_keymap(keyconf);
|
2009-11-05 17:32:06 +00:00
|
|
|
gesture_circle_modal_keymap(keyconf);
|
2018-10-05 10:27:04 +10:00
|
|
|
gesture_box_modal_keymap(keyconf);
|
2010-04-02 03:52:44 +00:00
|
|
|
gesture_zoom_border_modal_keymap(keyconf);
|
2010-04-04 00:21:37 +00:00
|
|
|
gesture_straightline_modal_keymap(keyconf);
|
2018-11-08 15:59:51 +11:00
|
|
|
|
|
|
|
WM_keymap_fix_linking();
|
2.5 Branch
==========
* Changed wmOperatorType, removing init/exit callbacks and adding cancel
callback, removed default storage in favor of properties. Defined return
values for exec/invoke/modal/cancel.
* Don't allocate operator on the stack, and removed operator copy for
handlers. Now it frees based on return values from callbacks, and just
keeps a wmOperator on the heap. Also it now registers after the operator
is fully finished, to get the correct final properties.
* Changed OP_get_* functions to return 1 if the property is found and 0
otherwise, gives more readable code in my opinion. Added OP_verify_*
functions to quickly check if the property is available and set if it's
not, that's common for exec/invoke.
* Removed WM_operatortypelist_append in favor of WM_operatortype_append
which takes a function pointer instead of a list, avoids macro's and
duplicating code.
* Fix a crash where the handler would still be used while it was freed by
the operator.
* Spacetypes now have operatortypes() and keymap() callbacks to abstract
them a bit more.
* Renamed C->curarea to C->area for consistency. Removed View3D/View2D/
SpaceIpo from bContext, seems bad to keep these.
* Set context variables like window/screen/area/region to NULL again when
leaving that context, instead of leaving the pointers there.
* Added if(G.f & G_DEBUG) for many of the prints, makes output a bit
cleaner and easier to debug.
* Fixed priority of the editors/interface module in scons, would otherwise
give link errors.
* Added start of generic view2d api.
* Added space_time with some basic drawing and a single operator to change
the frame.
2008-06-11 10:10:31 +00:00
|
|
|
}
|
|
|
|
|
2017-11-21 16:33:36 +11:00
|
|
|
/**
|
|
|
|
* Filter functions that can be used with rna_id_itemf() below.
|
|
|
|
* Should return false if 'id' should be excluded.
|
|
|
|
*/
|
|
|
|
static bool rna_id_enum_filter_single(ID *id, void *user_data)
|
|
|
|
{
|
|
|
|
return (id != user_data);
|
|
|
|
}
|
|
|
|
|
2009-11-04 10:25:57 +00:00
|
|
|
/* Generic itemf's for operators that take library args */
|
2017-11-21 16:33:36 +11:00
|
|
|
static const EnumPropertyItem *rna_id_itemf(
|
|
|
|
bContext *UNUSED(C), PointerRNA *UNUSED(ptr),
|
|
|
|
bool *r_free, ID *id, bool local,
|
|
|
|
bool (*filter_ids)(ID *id, void *user_data), void *user_data)
|
2009-11-04 10:25:57 +00:00
|
|
|
{
|
2012-03-27 01:24:16 +00:00
|
|
|
EnumPropertyItem item_tmp = {0}, *item = NULL;
|
|
|
|
int totitem = 0;
|
|
|
|
int i = 0;
|
2009-11-04 10:25:57 +00:00
|
|
|
|
2012-03-27 01:24:16 +00:00
|
|
|
for (; id; id = id->next) {
|
2017-11-21 16:33:36 +11:00
|
|
|
if ((filter_ids != NULL) && filter_ids(user_data, id) == false) {
|
Fix T54302 - Wrong added scene when adding a scene strip to the Sequencer
When adding scene strips to the sequencer, the wrong scenes were
getting getting added if some were skipped. For example:
Given 4 scenes (A, B, C, D) if you're trying to add the last 3 scenes
(B, C, D) as strips to the first scene (A), it would ended up adding
"A, B, C" instead of "B, C, D" as expected.
Fix provided by Andrew (signal9).
2018-03-13 23:04:58 +13:00
|
|
|
i++;
|
2017-11-21 16:33:36 +11:00
|
|
|
continue;
|
|
|
|
}
|
2017-11-06 17:17:10 +01:00
|
|
|
if (local == false || !ID_IS_LINKED(id)) {
|
2012-03-27 01:24:16 +00:00
|
|
|
item_tmp.identifier = item_tmp.name = id->name + 2;
|
|
|
|
item_tmp.value = i++;
|
2010-05-05 15:41:38 +00:00
|
|
|
RNA_enum_item_add(&item, &totitem, &item_tmp);
|
|
|
|
}
|
2009-11-04 10:25:57 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
RNA_enum_item_end(&item, &totitem);
|
2014-01-04 18:08:43 +11:00
|
|
|
*r_free = true;
|
2009-11-04 10:25:57 +00:00
|
|
|
|
|
|
|
return item;
|
|
|
|
}
|
|
|
|
|
2010-02-23 19:32:32 +00:00
|
|
|
/* can add more as needed */
|
2017-10-18 15:07:26 +11:00
|
|
|
const EnumPropertyItem *RNA_action_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2010-02-23 19:32:32 +00:00
|
|
|
{
|
2017-11-21 16:33:36 +11:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->action.first : NULL, false, NULL, NULL);
|
2010-05-05 15:41:38 +00:00
|
|
|
}
|
2012-04-23 07:32:13 +00:00
|
|
|
#if 0 /* UNUSED */
|
2017-10-18 15:07:26 +11:00
|
|
|
const EnumPropertyItem *RNA_action_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2010-05-05 15:41:38 +00:00
|
|
|
{
|
2014-04-01 11:34:00 +11:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->action.first : NULL, true);
|
2010-02-23 19:32:32 +00:00
|
|
|
}
|
2012-04-23 07:32:13 +00:00
|
|
|
#endif
|
2010-05-05 15:41:38 +00:00
|
|
|
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
const EnumPropertyItem *RNA_collection_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2009-11-04 10:25:57 +00:00
|
|
|
{
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->collection.first : NULL, false, NULL, NULL);
|
2010-05-05 15:41:38 +00:00
|
|
|
}
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
const EnumPropertyItem *RNA_collection_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2010-05-05 15:41:38 +00:00
|
|
|
{
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 15:57:22 +02:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->collection.first : NULL, true, NULL, NULL);
|
2009-11-04 10:25:57 +00:00
|
|
|
}
|
2010-05-05 15:41:38 +00:00
|
|
|
|
2017-10-18 15:07:26 +11:00
|
|
|
const EnumPropertyItem *RNA_image_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2010-03-05 18:19:32 +00:00
|
|
|
{
|
2017-11-21 16:33:36 +11:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->image.first : NULL, false, NULL, NULL);
|
2010-05-05 15:41:38 +00:00
|
|
|
}
|
2017-10-18 15:07:26 +11:00
|
|
|
const EnumPropertyItem *RNA_image_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2010-05-05 15:41:38 +00:00
|
|
|
{
|
2017-11-21 16:33:36 +11:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->image.first : NULL, true, NULL, NULL);
|
2010-03-05 18:19:32 +00:00
|
|
|
}
|
2010-05-05 15:41:38 +00:00
|
|
|
|
2017-10-18 15:07:26 +11:00
|
|
|
const EnumPropertyItem *RNA_scene_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2009-11-04 10:25:57 +00:00
|
|
|
{
|
2017-11-21 16:33:36 +11:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->scene.first : NULL, false, NULL, NULL);
|
2010-05-05 15:41:38 +00:00
|
|
|
}
|
2017-10-18 15:07:26 +11:00
|
|
|
const EnumPropertyItem *RNA_scene_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2010-05-05 15:41:38 +00:00
|
|
|
{
|
2017-11-21 16:33:36 +11:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->scene.first : NULL, true, NULL, NULL);
|
|
|
|
}
|
|
|
|
const EnumPropertyItem *RNA_scene_without_active_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
|
|
|
{
|
|
|
|
Scene *scene_active = C ? CTX_data_scene(C) : NULL;
|
|
|
|
return rna_id_itemf(
|
|
|
|
C, ptr, r_free, C ? (ID *)CTX_data_main(C)->scene.first : NULL, true,
|
|
|
|
rna_id_enum_filter_single, scene_active);
|
2009-11-04 10:25:57 +00:00
|
|
|
}
|
2017-10-18 15:07:26 +11:00
|
|
|
const EnumPropertyItem *RNA_movieclip_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2012-03-21 18:02:29 +00:00
|
|
|
{
|
2017-11-21 16:33:36 +11:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->movieclip.first : NULL, false, NULL, NULL);
|
2012-03-21 18:02:29 +00:00
|
|
|
}
|
2017-10-18 15:07:26 +11:00
|
|
|
const EnumPropertyItem *RNA_movieclip_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2012-03-21 18:02:29 +00:00
|
|
|
{
|
2017-11-21 16:33:36 +11:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->movieclip.first : NULL, true, NULL, NULL);
|
2012-03-21 18:02:29 +00:00
|
|
|
}
|
2012-06-07 18:24:36 +00:00
|
|
|
|
2017-10-18 15:07:26 +11:00
|
|
|
const EnumPropertyItem *RNA_mask_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2012-06-07 18:24:36 +00:00
|
|
|
{
|
2017-11-21 16:33:36 +11:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->mask.first : NULL, false, NULL, NULL);
|
2012-06-07 18:24:36 +00:00
|
|
|
}
|
2017-10-18 15:07:26 +11:00
|
|
|
const EnumPropertyItem *RNA_mask_local_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), bool *r_free)
|
2012-06-07 18:24:36 +00:00
|
|
|
{
|
2017-11-21 16:33:36 +11:00
|
|
|
return rna_id_itemf(C, ptr, r_free, C ? (ID *)CTX_data_main(C)->mask.first : NULL, true, NULL, NULL);
|
2012-06-07 18:24:36 +00:00
|
|
|
}
|