archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.
Files
1b8eab0fab7b6c4755e10366c43f7f1a7097f661
blender-archive/source/blender/editors/sculpt_paint/paint_ops.c

657 lines
23 KiB
C
Raw Normal View History

doxygen: prevent GPL license block from being parsed as doxygen comment.
2011-02-23 10:52:22 +00:00
/*
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +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
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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,
correct fsf address
2010-02-12 13:34:04 +00:00
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
*
* ***** END GPL LICENSE BLOCK *****
*/
doxygen: blender/editors tagged.
2011-02-27 20:29:51 +00:00
/** \file blender/editors/sculpt_paint/paint_ops.c
* \ingroup edsculpt
*/
== Radial control == Patch to make the radial control more generic with RNA. Patch was reviewed here: http://codereview.appspot.com/4280080/ Prior to this update, the radial control code in trunk had generic parts of the radial control implemented as an incomplete operator within WM. Then each different user of the radial control had to implement a separate operator to actually pass in specific brush data -- e.g. sculpt's brush size, vpaint's brush size, etc. This patch removes all the extra operators and makes the WM operator do everything. It now takes several RNA path strings as its properties -- the only required property is data_path, which specifies the data to be modified by the radial control. The other paths affect display in various ways, e.g. rotation, color, etc. In addition to decreasing some duplicate paint brush code, these updates make it pretty easy to enable radial control for other purposes (and it can be set up entirely though python or keymaps, no extra C code needed.)
2011-05-12 01:57:47 +00:00
#include "MEM_guardedalloc.h"
doxygen: blender/editors tagged.
2011-02-27 20:29:51 +00:00
== Radial control == Patch to make the radial control more generic with RNA. Patch was reviewed here: http://codereview.appspot.com/4280080/ Prior to this update, the radial control code in trunk had generic parts of the radial control implemented as an incomplete operator within WM. Then each different user of the radial control had to implement a separate operator to actually pass in specific brush data -- e.g. sculpt's brush size, vpaint's brush size, etc. This patch removes all the extra operators and makes the WM operator do everything. It now takes several RNA path strings as its properties -- the only required property is data_path, which specifies the data to be modified by the radial control. The other paths affect display in various ways, e.g. rotation, color, etc. In addition to decreasing some duplicate paint brush code, these updates make it pretty easy to enable radial control for other purposes (and it can be set up entirely though python or keymaps, no extra C code needed.)
2011-05-12 01:57:47 +00:00
#include <stdlib.h>
#include "BLI_string.h"
split BKE_utildefines.h, now it only has blender specific defines like GS() MAKE_ID, FILE_MAXDIR, moved the generic defines to BLI_utildefines.h. no functional changes.
2011-01-07 18:36:47 +00:00
#include "BLI_utildefines.h"
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
#include "DNA_object_types.h"
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
#include "DNA_scene_types.h"
Add back sculpt mode brush keys. Operator for switching brushes based on type, cycling through brushes when multiple exist. This has the advantages over the old method that it doenst rely on hard coded brush names and if there are multiple brushes of the same type it cycles between them. also fix error in previous commit which broke number buttons changing brushes.
2011-04-01 06:14:39 +00:00
#include "DNA_brush_types.h"
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
#include "BKE_brush.h"
#include "BKE_context.h"
#include "BKE_paint.h"
Add back sculpt mode brush keys. Operator for switching brushes based on type, cycling through brushes when multiple exist. This has the advantages over the old method that it doenst rely on hard coded brush names and if there are multiple brushes of the same type it cycles between them. also fix error in previous commit which broke number buttons changing brushes.
2011-04-01 06:14:39 +00:00
#include "BKE_main.h"
2.5: * Image painting back. 2d paint, 3d paint and projection, undo, pressure, repeating paint operations, etc should all work. Drawing cursor needs a bit of work, only gets shown when enabling texture paint mode now. * Move sculpt, image paint, and vertex/weight paint into a single sculpt_paint module. Doesn't make much difference now, but nice to have it together for better integration and consistency in the future.
2009-02-19 23:53:40 +00:00
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
#include "ED_sculpt.h"
added back face mask mouse selection and made shift+k fill weight paint and vertex color
2009-10-22 12:59:14 +00:00
#include "ED_screen.h"
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
#include "UI_resources.h"
2.5: * Image painting back. 2d paint, 3d paint and projection, undo, pressure, repeating paint operations, etc should all work. Drawing cursor needs a bit of work, only gets shown when enabling texture paint mode now. * Move sculpt, image paint, and vertex/weight paint into a single sculpt_paint module. Doesn't make much difference now, but nice to have it together for better integration and consistency in the future.
2009-02-19 23:53:40 +00:00
#include "WM_api.h"
#include "WM_types.h"
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
#include "RNA_access.h"
#include "RNA_define.h"
Add back sculpt mode brush keys. Operator for switching brushes based on type, cycling through brushes when multiple exist. This has the advantages over the old method that it doenst rely on hard coded brush names and if there are multiple brushes of the same type it cycles between them. also fix error in previous commit which broke number buttons changing brushes.
2011-04-01 06:14:39 +00:00
#include "RNA_enum_types.h"
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
2.5: * Image painting back. 2d paint, 3d paint and projection, undo, pressure, repeating paint operations, etc should all work. Drawing cursor needs a bit of work, only gets shown when enabling texture paint mode now. * Move sculpt, image paint, and vertex/weight paint into a single sculpt_paint module. Doesn't make much difference now, but nice to have it together for better integration and consistency in the future.
2009-02-19 23:53:40 +00:00
#include "paint_intern.h"
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
#include "sculpt_intern.h"
2.5: * Image painting back. 2d paint, 3d paint and projection, undo, pressure, repeating paint operations, etc should all work. Drawing cursor needs a bit of work, only gets shown when enabling texture paint mode now. * Move sculpt, image paint, and vertex/weight paint into a single sculpt_paint module. Doesn't make much difference now, but nice to have it together for better integration and consistency in the future.
2009-02-19 23:53:40 +00:00
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
#include <string.h>
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
//#include <stdio.h>
Add back sculpt mode brush keys. Operator for switching brushes based on type, cycling through brushes when multiple exist. This has the advantages over the old method that it doenst rely on hard coded brush names and if there are multiple brushes of the same type it cycles between them. also fix error in previous commit which broke number buttons changing brushes.
2011-04-01 06:14:39 +00:00
#include <stddef.h>
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
/* Brush operators */
tag UNUSED() for operator exec() and invoke() functions.
2010-10-15 01:36:14 +00:00
static int brush_add_exec(bContext *C, wmOperator *UNUSED(op))
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
{
2.5 Paint: * Updated the brush selection UI to make the slots less apparent; adding and removing brushes now directly adds and removes slots.
2009-08-17 15:05:18 +00:00
/*int type = RNA_enum_get(op->ptr, "type");*/
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
Paint *paint = paint_get_active(CTX_data_scene(C));
include cleanup, no functional changes - removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases) - removed DNA_wave_types.h (never used) - removed Main.wave
2010-08-04 04:01:27 +00:00
struct Brush *br = paint_brush(paint);
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
if (br)
br = copy_brush(br);
else
br = add_brush("Brush");
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
paint_brush_set(paint_get_active(CTX_data_scene(C)), br);
added back face mask mouse selection and made shift+k fill weight paint and vertex color
2009-10-22 12:59:14 +00:00
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
return OPERATOR_FINISHED;
}
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
static void BRUSH_OT_add(wmOperatorType *ot)
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
{
/* identifiers */
ot->name= "Add Brush";
spaces -> tabs, (4 spaces == 1 tab, only for white space preceding text)
2010-03-22 09:30:00 +00:00
ot->description= "Add brush by mode type";
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
ot->idname= "BRUSH_OT_add";
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
/* api callbacks */
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
ot->exec= brush_add_exec;
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
/* flags */
== Sculpt/Paint Fixes == * Fix: unify strength and size did work consistently with other paint modes * Fix: If [ and ] keys were used to resize a brush it was not possible to increase the size of the brush if it went under 10 pixels * Fix: Made interpretation of brush size consistent across all modes, Texture/Image paint interpreted brush size as the diameter while all the other modes interpret it as radius * Fix: The default spacing for vertex paint brushes was 3%, should be 10% * Fix: due to fixes to unified strength, re-enabled 'Unify Size' by default * Fix: Unified size and strength were stored in UserPrefs, moved this to ToolSettings * Fix: The setting of pressure sensitivity was not unified when strength or size were unified. Now the appropriate pressure sensitivity setting is also unified across all brushes when corresponding unification option is selected * Fix: When using [ and ] to resize the brush it didn't immediately redraw * Fix: fkey resizing/"re-strength-ing" was not working consistently accross all paint modes due to only sculpt mode having full support for unified size and strength, now it works properly. * Fix: other paint modes did expose the ability to have a custom brush colors, so I added the small bit of code to allow it. Note: I made all of the other paint mode brushes white. Note2: Actually, probably want to make the paint modes use the selected color for painting instead of a constant brush color. * I had removed OPTYPE_REGISTER from some Sculpt/Paint operators but in this commit I add them back. I'm not completely sure what this option does so I don't want to disturb it for now.
2010-07-22 18:56:46 +00:00
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
}
static int brush_scale_size_exec(bContext *C, wmOperator *op)
{
== Sculpt/Paint Fixes == * Fix: unify strength and size did work consistently with other paint modes * Fix: If [ and ] keys were used to resize a brush it was not possible to increase the size of the brush if it went under 10 pixels * Fix: Made interpretation of brush size consistent across all modes, Texture/Image paint interpreted brush size as the diameter while all the other modes interpret it as radius * Fix: The default spacing for vertex paint brushes was 3%, should be 10% * Fix: due to fixes to unified strength, re-enabled 'Unify Size' by default * Fix: Unified size and strength were stored in UserPrefs, moved this to ToolSettings * Fix: The setting of pressure sensitivity was not unified when strength or size were unified. Now the appropriate pressure sensitivity setting is also unified across all brushes when corresponding unification option is selected * Fix: When using [ and ] to resize the brush it didn't immediately redraw * Fix: fkey resizing/"re-strength-ing" was not working consistently accross all paint modes due to only sculpt mode having full support for unified size and strength, now it works properly. * Fix: other paint modes did expose the ability to have a custom brush colors, so I added the small bit of code to allow it. Note: I made all of the other paint mode brushes white. Note2: Actually, probably want to make the paint modes use the selected color for painting instead of a constant brush color. * I had removed OPTYPE_REGISTER from some Sculpt/Paint operators but in this commit I add them back. I'm not completely sure what this option does so I don't want to disturb it for now.
2010-07-22 18:56:46 +00:00
Paint *paint= paint_get_active(CTX_data_scene(C));
include cleanup, no functional changes - removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases) - removed DNA_wave_types.h (never used) - removed Main.wave
2010-08-04 04:01:27 +00:00
struct Brush *brush= paint_brush(paint);
minor warning fix brush_alpha was being converted to an int not a float, if this is intentional it should be delared 'const int', but looks like it wasnt.
2010-07-22 22:04:07 +00:00
// Object *ob= CTX_data_active_object(C);
== Sculpt/Paint Fixes == * Fix: unify strength and size did work consistently with other paint modes * Fix: If [ and ] keys were used to resize a brush it was not possible to increase the size of the brush if it went under 10 pixels * Fix: Made interpretation of brush size consistent across all modes, Texture/Image paint interpreted brush size as the diameter while all the other modes interpret it as radius * Fix: The default spacing for vertex paint brushes was 3%, should be 10% * Fix: due to fixes to unified strength, re-enabled 'Unify Size' by default * Fix: Unified size and strength were stored in UserPrefs, moved this to ToolSettings * Fix: The setting of pressure sensitivity was not unified when strength or size were unified. Now the appropriate pressure sensitivity setting is also unified across all brushes when corresponding unification option is selected * Fix: When using [ and ] to resize the brush it didn't immediately redraw * Fix: fkey resizing/"re-strength-ing" was not working consistently accross all paint modes due to only sculpt mode having full support for unified size and strength, now it works properly. * Fix: other paint modes did expose the ability to have a custom brush colors, so I added the small bit of code to allow it. Note: I made all of the other paint mode brushes white. Note2: Actually, probably want to make the paint modes use the selected color for painting instead of a constant brush color. * I had removed OPTYPE_REGISTER from some Sculpt/Paint operators but in this commit I add them back. I'm not completely sure what this option does so I don't want to disturb it for now.
2010-07-22 18:56:46 +00:00
float scalar= RNA_float_get(op->ptr, "scalar");
if (brush) {
// pixel radius
{
const int old_size= brush_size(brush);
int size= (int)(scalar*old_size);
minor warning fix brush_alpha was being converted to an int not a float, if this is intentional it should be delared 'const int', but looks like it wasnt.
2010-07-22 22:04:07 +00:00
if (old_size == size) {
== Sculpt/Paint Fixes == * Fix: unify strength and size did work consistently with other paint modes * Fix: If [ and ] keys were used to resize a brush it was not possible to increase the size of the brush if it went under 10 pixels * Fix: Made interpretation of brush size consistent across all modes, Texture/Image paint interpreted brush size as the diameter while all the other modes interpret it as radius * Fix: The default spacing for vertex paint brushes was 3%, should be 10% * Fix: due to fixes to unified strength, re-enabled 'Unify Size' by default * Fix: Unified size and strength were stored in UserPrefs, moved this to ToolSettings * Fix: The setting of pressure sensitivity was not unified when strength or size were unified. Now the appropriate pressure sensitivity setting is also unified across all brushes when corresponding unification option is selected * Fix: When using [ and ] to resize the brush it didn't immediately redraw * Fix: fkey resizing/"re-strength-ing" was not working consistently accross all paint modes due to only sculpt mode having full support for unified size and strength, now it works properly. * Fix: other paint modes did expose the ability to have a custom brush colors, so I added the small bit of code to allow it. Note: I made all of the other paint mode brushes white. Note2: Actually, probably want to make the paint modes use the selected color for painting instead of a constant brush color. * I had removed OPTYPE_REGISTER from some Sculpt/Paint operators but in this commit I add them back. I'm not completely sure what this option does so I don't want to disturb it for now.
2010-07-22 18:56:46 +00:00
if (scalar > 1) {
size++;
}
else if (scalar < 1) {
size--;
}
minor warning fix brush_alpha was being converted to an int not a float, if this is intentional it should be delared 'const int', but looks like it wasnt.
2010-07-22 22:04:07 +00:00
}
== Sculpt/Paint Fixes == * Fix: unify strength and size did work consistently with other paint modes * Fix: If [ and ] keys were used to resize a brush it was not possible to increase the size of the brush if it went under 10 pixels * Fix: Made interpretation of brush size consistent across all modes, Texture/Image paint interpreted brush size as the diameter while all the other modes interpret it as radius * Fix: The default spacing for vertex paint brushes was 3%, should be 10% * Fix: due to fixes to unified strength, re-enabled 'Unify Size' by default * Fix: Unified size and strength were stored in UserPrefs, moved this to ToolSettings * Fix: The setting of pressure sensitivity was not unified when strength or size were unified. Now the appropriate pressure sensitivity setting is also unified across all brushes when corresponding unification option is selected * Fix: When using [ and ] to resize the brush it didn't immediately redraw * Fix: fkey resizing/"re-strength-ing" was not working consistently accross all paint modes due to only sculpt mode having full support for unified size and strength, now it works properly. * Fix: other paint modes did expose the ability to have a custom brush colors, so I added the small bit of code to allow it. Note: I made all of the other paint mode brushes white. Note2: Actually, probably want to make the paint modes use the selected color for painting instead of a constant brush color. * I had removed OPTYPE_REGISTER from some Sculpt/Paint operators but in this commit I add them back. I'm not completely sure what this option does so I don't want to disturb it for now.
2010-07-22 18:56:46 +00:00
CLAMP(size, 1, 2000); // XXX magic number
brush_set_size(brush, size);
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
}
== Sculpt/Paint Fixes == * Fix: unify strength and size did work consistently with other paint modes * Fix: If [ and ] keys were used to resize a brush it was not possible to increase the size of the brush if it went under 10 pixels * Fix: Made interpretation of brush size consistent across all modes, Texture/Image paint interpreted brush size as the diameter while all the other modes interpret it as radius * Fix: The default spacing for vertex paint brushes was 3%, should be 10% * Fix: due to fixes to unified strength, re-enabled 'Unify Size' by default * Fix: Unified size and strength were stored in UserPrefs, moved this to ToolSettings * Fix: The setting of pressure sensitivity was not unified when strength or size were unified. Now the appropriate pressure sensitivity setting is also unified across all brushes when corresponding unification option is selected * Fix: When using [ and ] to resize the brush it didn't immediately redraw * Fix: fkey resizing/"re-strength-ing" was not working consistently accross all paint modes due to only sculpt mode having full support for unified size and strength, now it works properly. * Fix: other paint modes did expose the ability to have a custom brush colors, so I added the small bit of code to allow it. Note: I made all of the other paint mode brushes white. Note2: Actually, probably want to make the paint modes use the selected color for painting instead of a constant brush color. * I had removed OPTYPE_REGISTER from some Sculpt/Paint operators but in this commit I add them back. I'm not completely sure what this option does so I don't want to disturb it for now.
2010-07-22 18:56:46 +00:00
// unprojected radius
{
float unprojected_radius= scalar*brush_unprojected_radius(brush);
object/paint/misc-files: floats were being implicitly promoted to doubles, adjust to use floats. - also UV angle stretching was using radians->deg which wasn't needed.
2011-03-27 14:59:55 +00:00
if (unprojected_radius < 0.001f) // XXX magic number
== Sculpt/Paint Fixes == * Fix: unify strength and size did work consistently with other paint modes * Fix: If [ and ] keys were used to resize a brush it was not possible to increase the size of the brush if it went under 10 pixels * Fix: Made interpretation of brush size consistent across all modes, Texture/Image paint interpreted brush size as the diameter while all the other modes interpret it as radius * Fix: The default spacing for vertex paint brushes was 3%, should be 10% * Fix: due to fixes to unified strength, re-enabled 'Unify Size' by default * Fix: Unified size and strength were stored in UserPrefs, moved this to ToolSettings * Fix: The setting of pressure sensitivity was not unified when strength or size were unified. Now the appropriate pressure sensitivity setting is also unified across all brushes when corresponding unification option is selected * Fix: When using [ and ] to resize the brush it didn't immediately redraw * Fix: fkey resizing/"re-strength-ing" was not working consistently accross all paint modes due to only sculpt mode having full support for unified size and strength, now it works properly. * Fix: other paint modes did expose the ability to have a custom brush colors, so I added the small bit of code to allow it. Note: I made all of the other paint mode brushes white. Note2: Actually, probably want to make the paint modes use the selected color for painting instead of a constant brush color. * I had removed OPTYPE_REGISTER from some Sculpt/Paint operators but in this commit I add them back. I'm not completely sure what this option does so I don't want to disturb it for now.
2010-07-22 18:56:46 +00:00
unprojected_radius= 0.001f;
brush_set_unprojected_radius(brush, unprojected_radius);
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
}
}
return OPERATOR_FINISHED;
}
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
static void BRUSH_OT_scale_size(wmOperatorType *ot)
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
{
/* identifiers */
ot->name= "Scale Sculpt/Paint Brush Size";
ot->description= "Change brush size by a scalar";
ot->idname= "BRUSH_OT_scale_size";
/* api callbacks */
ot->exec= brush_scale_size_exec;
/* flags */
== Sculpt/Paint Fixes == * Fix: unify strength and size did work consistently with other paint modes * Fix: If [ and ] keys were used to resize a brush it was not possible to increase the size of the brush if it went under 10 pixels * Fix: Made interpretation of brush size consistent across all modes, Texture/Image paint interpreted brush size as the diameter while all the other modes interpret it as radius * Fix: The default spacing for vertex paint brushes was 3%, should be 10% * Fix: due to fixes to unified strength, re-enabled 'Unify Size' by default * Fix: Unified size and strength were stored in UserPrefs, moved this to ToolSettings * Fix: The setting of pressure sensitivity was not unified when strength or size were unified. Now the appropriate pressure sensitivity setting is also unified across all brushes when corresponding unification option is selected * Fix: When using [ and ] to resize the brush it didn't immediately redraw * Fix: fkey resizing/"re-strength-ing" was not working consistently accross all paint modes due to only sculpt mode having full support for unified size and strength, now it works properly. * Fix: other paint modes did expose the ability to have a custom brush colors, so I added the small bit of code to allow it. Note: I made all of the other paint mode brushes white. Note2: Actually, probably want to make the paint modes use the selected color for painting instead of a constant brush color. * I had removed OPTYPE_REGISTER from some Sculpt/Paint operators but in this commit I add them back. I'm not completely sure what this option does so I don't want to disturb it for now.
2010-07-22 18:56:46 +00:00
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
RNA_def_float(ot->srna, "scalar", 1, 0, 2, "Scalar", "Factor to scale brush size by", 0, 2);
2.5 Sculpt: * Added a new Paint type in scene DNA. This is now the base struct for Sculpt. * The Paint type contains a list of Brushes, you can add or remove these much like material and texture slots. * Modified the UI for the new Paint type, now shows the list of brushes active for this mode * Added a New Brush operator, shows in the UI as a list of brush tool types to add * Made the sculpt tool property UI smaller and not expanded, expectation is that we will have a number of preset brushes that will cover the basic sculpt brush types TODO: * Vertex paint, weight paint, texture paint need to be converted to this system next * Add brush presets to the default blend
2009-08-16 19:50:00 +00:00
}
tag UNUSED() for operator exec() and invoke() functions.
2010-10-15 01:36:14 +00:00
static int vertex_color_set_exec(bContext *C, wmOperator *UNUSED(op))
2.5/Vertex paint: * Added operator for filling vertex colors with the brush color * Pythonized the vertex paint menu
2009-08-22 02:27:37 +00:00
{
Scene *scene = CTX_data_scene(C);
added back face mask mouse selection and made shift+k fill weight paint and vertex color
2009-10-22 12:59:14 +00:00
Object *obact = CTX_data_active_object(C);
unsigned int paintcol = vpaint_get_current_col(scene->toolsettings->vpaint);
vpaint_fill(obact, paintcol);
2.5/Vertex paint: * Added operator for filling vertex colors with the brush color * Pythonized the vertex paint menu
2009-08-22 02:27:37 +00:00
added back face mask mouse selection and made shift+k fill weight paint and vertex color
2009-10-22 12:59:14 +00:00
ED_region_tag_redraw(CTX_wm_region(C)); // XXX - should redraw all 3D views
2.5/Vertex paint: * Added operator for filling vertex colors with the brush color * Pythonized the vertex paint menu
2009-08-22 02:27:37 +00:00
return OPERATOR_FINISHED;
}
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
static void PAINT_OT_vertex_color_set(wmOperatorType *ot)
2.5/Vertex paint: * Added operator for filling vertex colors with the brush color * Pythonized the vertex paint menu
2009-08-22 02:27:37 +00:00
{
/* identifiers */
ot->name= "Set Vertex Colors";
ot->idname= "PAINT_OT_vertex_color_set";
/* api callbacks */
ot->exec= vertex_color_set_exec;
ot->poll= vertex_paint_mode_poll;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
tag UNUSED() for operator exec() and invoke() functions.
2010-10-15 01:36:14 +00:00
static int brush_reset_exec(bContext *C, wmOperator *UNUSED(op))
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
{
Paint *paint = paint_get_active(CTX_data_scene(C));
include cleanup, no functional changes - removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases) - removed DNA_wave_types.h (never used) - removed Main.wave
2010-08-04 04:01:27 +00:00
struct Brush *brush = paint_brush(paint);
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
Object *ob = CTX_data_active_object(C);
if(!ob) return OPERATOR_CANCELLED;
if(ob->mode & OB_MODE_SCULPT)
brush_reset_sculpt(brush);
/* TODO: other modes */
return OPERATOR_FINISHED;
}
made most variables which are only used in a single file and not defined in header static for blenlib, blenkernel and editors.
2011-02-14 17:55:27 +00:00
static void BRUSH_OT_reset(wmOperatorType *ot)
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
{
/* identifiers */
ot->name= "Reset Brush";
ot->description= "Return brush to defaults based on current tool";
ot->idname= "BRUSH_OT_reset";
/* api callbacks */
ot->exec= brush_reset_exec;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
}
Add back sculpt mode brush keys. Operator for switching brushes based on type, cycling through brushes when multiple exist. This has the advantages over the old method that it doenst rely on hard coded brush names and if there are multiple brushes of the same type it cycles between them. also fix error in previous commit which broke number buttons changing brushes.
2011-04-01 06:14:39 +00:00
/* generic functions for setting the active brush based on the tool */
static Brush *brush_tool_cycle(Main *bmain, Brush *brush_orig, const int tool, const size_t tool_offset, const int ob_mode)
{
struct Brush *brush;
if(!brush_orig && !(brush_orig= bmain->brush.first)) {
return NULL;
}
/* get the next brush with the active tool */
for( brush= brush_orig->id.next ? brush_orig->id.next : bmain->brush.first;
brush != brush_orig;
brush= brush->id.next ? brush->id.next : bmain->brush.first)
{
if( (brush->ob_mode & ob_mode) &&
(*(((char *)brush) + tool_offset) == tool)
) {
return brush;
}
}
return NULL;
}
static int brush_generic_tool_set(Main *bmain, Paint *paint, const int tool, const size_t tool_offset, const int ob_mode)
{
struct Brush *brush, *brush_orig= paint_brush(paint);
brush= brush_tool_cycle(bmain, brush_orig, tool, tool_offset, ob_mode);
if(brush) {
paint_brush_set(paint, brush);
WM_main_add_notifier(NC_BRUSH|NA_EDITED, brush);
return OPERATOR_FINISHED;
}
else {
return OPERATOR_CANCELLED;
}
}
static int brush_sculpt_tool_set_exec(bContext *C, wmOperator *op)
{
Main *bmain= CTX_data_main(C);
Scene *scene= CTX_data_scene(C);
return brush_generic_tool_set(bmain, &scene->toolsettings->sculpt->paint, RNA_enum_get(op->ptr, "tool"), offsetof(Brush, sculpt_tool), OB_MODE_SCULPT);
}
static void BRUSH_OT_sculpt_tool_set(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Sculpt Tool Set";
ot->description= "Set the sculpt tool";
ot->idname= "BRUSH_OT_sculpt_tool_set";
/* api callbacks */
ot->exec= brush_sculpt_tool_set_exec;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* props */
ot->prop= RNA_def_enum(ot->srna, "tool", brush_sculpt_tool_items, 0, "Tool", "");
}
static int brush_vertex_tool_set_exec(bContext *C, wmOperator *op)
{
Main *bmain= CTX_data_main(C);
Scene *scene= CTX_data_scene(C);
return brush_generic_tool_set(bmain, &scene->toolsettings->vpaint->paint, RNA_enum_get(op->ptr, "tool"), offsetof(Brush, vertexpaint_tool), OB_MODE_VERTEX_PAINT);
}
static void BRUSH_OT_vertex_tool_set(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Vertex Paint Tool Set";
ot->description= "Set the vertex paint tool";
ot->idname= "BRUSH_OT_vertex_tool_set";
/* api callbacks */
ot->exec= brush_vertex_tool_set_exec;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* props */
ot->prop= RNA_def_enum(ot->srna, "tool", brush_vertex_tool_items, 0, "Tool", "");
}
static int brush_weight_tool_set_exec(bContext *C, wmOperator *op)
{
Main *bmain= CTX_data_main(C);
Scene *scene= CTX_data_scene(C);
/* vertexpaint_tool is used for weight paint mode */
return brush_generic_tool_set(bmain, &scene->toolsettings->wpaint->paint, RNA_enum_get(op->ptr, "tool"), offsetof(Brush, vertexpaint_tool), OB_MODE_WEIGHT_PAINT);
}
static void BRUSH_OT_weight_tool_set(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Weight Paint Tool Set";
ot->description= "Set the weight paint tool";
ot->idname= "BRUSH_OT_weight_tool_set";
/* api callbacks */
ot->exec= brush_weight_tool_set_exec;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* props */
ot->prop= RNA_def_enum(ot->srna, "tool", brush_vertex_tool_items, 0, "Tool", "");
}
static int brush_image_tool_set_exec(bContext *C, wmOperator *op)
{
Main *bmain= CTX_data_main(C);
Scene *scene= CTX_data_scene(C);
return brush_generic_tool_set(bmain, &scene->toolsettings->imapaint.paint, RNA_enum_get(op->ptr, "tool"), offsetof(Brush, imagepaint_tool), OB_MODE_TEXTURE_PAINT);
}
static void BRUSH_OT_image_tool_set(wmOperatorType *ot)
{
/* identifiers */
ot->name= "Image Paint Tool Set";
ot->description= "Set the image tool";
ot->idname= "BRUSH_OT_image_tool_set";
/* api callbacks */
ot->exec= brush_image_tool_set_exec;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
/* props */
ot->prop= RNA_def_enum(ot->srna, "tool", brush_image_tool_items, 0, "Tool", "");
}
2.5: * Image painting back. 2d paint, 3d paint and projection, undo, pressure, repeating paint operations, etc should all work. Drawing cursor needs a bit of work, only gets shown when enabling texture paint mode now. * Move sculpt, image paint, and vertex/weight paint into a single sculpt_paint module. Doesn't make much difference now, but nice to have it together for better integration and consistency in the future.
2009-02-19 23:53:40 +00:00
/**************************** registration **********************************/
void ED_operatortypes_paint(void)
{
2.5/Paint modes: * Moved brush curve preset operator out of sculpt to paint_utils * Added a button to the curve panel to set the preset
2009-08-14 04:45:29 +00:00
/* brush */
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
WM_operatortype_append(BRUSH_OT_add);
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
WM_operatortype_append(BRUSH_OT_scale_size);
2.5/Paint modes: * Moved brush curve preset operator out of sculpt to paint_utils * Added a button to the curve panel to set the preset
2009-08-14 04:45:29 +00:00
WM_operatortype_append(BRUSH_OT_curve_preset);
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
WM_operatortype_append(BRUSH_OT_reset);
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
Add back sculpt mode brush keys. Operator for switching brushes based on type, cycling through brushes when multiple exist. This has the advantages over the old method that it doenst rely on hard coded brush names and if there are multiple brushes of the same type it cycles between them. also fix error in previous commit which broke number buttons changing brushes.
2011-04-01 06:14:39 +00:00
/* note, particle uses a different system, can be added with existing operators in wm.py */
WM_operatortype_append(BRUSH_OT_sculpt_tool_set);
WM_operatortype_append(BRUSH_OT_vertex_tool_set);
WM_operatortype_append(BRUSH_OT_weight_tool_set);
WM_operatortype_append(BRUSH_OT_image_tool_set);
2.5: * Image painting back. 2d paint, 3d paint and projection, undo, pressure, repeating paint operations, etc should all work. Drawing cursor needs a bit of work, only gets shown when enabling texture paint mode now. * Move sculpt, image paint, and vertex/weight paint into a single sculpt_paint module. Doesn't make much difference now, but nice to have it together for better integration and consistency in the future.
2009-02-19 23:53:40 +00:00
/* image */
WM_operatortype_append(PAINT_OT_texture_paint_toggle);
WM_operatortype_append(PAINT_OT_image_paint);
WM_operatortype_append(PAINT_OT_sample_color);
WM_operatortype_append(PAINT_OT_grab_clone);
- use clear, set, add, enable, disable and toggle as a prefix in operator names - use select as a suffix eg UV_OT_loop_select -> UV_OT_select_loop - Each select all operator was using slightly different wording... select_all, deselect_all, de_select_all, select_de_select_all -> select_all_toggle - selection -> select - POSE_OT_select_connected -> POSE_OT_select_linked to match other operators - NODE_OT_delete_selection -> NODE_OT_delete since its not used in other operators - ANIM_OT_previewrange_define -> ANIM_OT_previewrange_set to match other operators - NODE_OT_fit_all -> NODE_OT_view_all to match other operators - View2D_OT_* -> VIEW2D_OT_* to match VIEW3D - View2D_OT_view_downscroll -> VIEW2D_OT_scroll_down more logical - removed MARKER_OT_mouseselect_extend and made extend a boolean property of MARKER_OT_mouseselect - MARKER_OT_mouseselect -> MARKER_OT_select - GROUP_OT_group_remove -> GROUP_OT_objects_remove more logical since its removing objects from groups - MESH_OT_removedoublesflag -> MESH_OT_remove_doubles - redundant words MESH_OT_split_mesh -> MESH_OT_split, OBJECT_OT_object_delete -> OBJECT_OT_delete renamed selection operator properties extend_select -> extend column_select -> column select_children_only -> children_only ... Since these are all in the context of selection operators there is no need for the extra 'select' in the property name. Updated docs http://www.graphicall.org/ftp/ideasman42/html/bpyoperator-module.html
2009-03-29 02:15:13 +00:00
WM_operatortype_append(PAINT_OT_clone_cursor_set);
re-project: operators for projecting from a view screenshot rather then a camera. - new mode for projecting an image with the view matrix saved in the image id-properties rather then using the camera matrix. - operator to screenshot the view and create a new image with the view matrix stored in the image. these will be used for better re-project integration and are not immediately very useful.
2010-03-06 19:46:21 +00:00
WM_operatortype_append(PAINT_OT_project_image);
WM_operatortype_append(PAINT_OT_image_from_view);
2.5: * Image painting back. 2d paint, 3d paint and projection, undo, pressure, repeating paint operations, etc should all work. Drawing cursor needs a bit of work, only gets shown when enabling texture paint mode now. * Move sculpt, image paint, and vertex/weight paint into a single sculpt_paint module. Doesn't make much difference now, but nice to have it together for better integration and consistency in the future.
2009-02-19 23:53:40 +00:00
/* weight */
WM_operatortype_append(PAINT_OT_weight_paint_toggle);
WM_operatortype_append(PAINT_OT_weight_paint);
added back face mask mouse selection and made shift+k fill weight paint and vertex color
2009-10-22 12:59:14 +00:00
WM_operatortype_append(PAINT_OT_weight_set);
Assign automatic/envelope weights in weight paint mode is back, accessible from W key and in new Weights menu in the header.
2010-01-26 11:11:53 +00:00
WM_operatortype_append(PAINT_OT_weight_from_bones);
fix [#27479] Missing 'Select vertex groups under the cursor' in weight paint mode really todo :) but still needs to be done. Split this into 2 operators, works like 2.4x - Ctrl+LMB samples weight. - Shift+LMB selects vertex groups.
2011-05-25 10:07:59 +00:00
WM_operatortype_append(PAINT_OT_weight_sample);
WM_operatortype_append(PAINT_OT_weight_sample_group);
2.5: * Image painting back. 2d paint, 3d paint and projection, undo, pressure, repeating paint operations, etc should all work. Drawing cursor needs a bit of work, only gets shown when enabling texture paint mode now. * Move sculpt, image paint, and vertex/weight paint into a single sculpt_paint module. Doesn't make much difference now, but nice to have it together for better integration and consistency in the future.
2009-02-19 23:53:40 +00:00
Split do_weight_paint_vertex() to isolate the simple case. Added a tool-tip to the "fix deforms" op. Removed code markers: "Radish"
2011-09-18 17:10:28 +00:00
/* vertex selection */
Lots of incomplete changes: Weight Paint Vertex Select tweaked to act like edit mode's select and Circle select was added, but clipping is not working properly for either. Select all was added too, but to the Q key until I look into overriding A's select all bones. The select vertices checkbox was moved to the header, but it does not force face select mask to turn off yet--and it doesn't have the correct icon. There will definitely be an update tomorrow to fix the problems with all or most of the issues.
2011-07-12 19:06:06 +00:00
WM_operatortype_append(PAINT_OT_vert_select_all);
I made multitude of fixes based on the comments provided online: Removed the drawSelectedVerts and added drawSelectedVertices, which uses dm->foreachMappedVert. In calc_weightpaint_vert_color(): Made the weight paint color black and return instead of input=-1 Made the pose bone selection normal when multi-paint is inactive. Name fix for functions using mv instead of mvert. Used vector functions provided by the math lib. Changed some MEM_callocN references to be stacks. Changed dm_deform_clear to use ob->derivedDeform primarily Made the variable "float **changes" into "float (*changes)[2]" Used CTX_data_active_object() in place of CTX_data_pointer_get_type() Added the invert selection hotkey "Ctrl+I" to weight paint's vertex mask.
2011-09-18 01:09:18 +00:00
WM_operatortype_append(PAINT_OT_vert_select_inverse);
Lots of incomplete changes: Weight Paint Vertex Select tweaked to act like edit mode's select and Circle select was added, but clipping is not working properly for either. Select all was added too, but to the Q key until I look into overriding A's select all bones. The select vertices checkbox was moved to the header, but it does not force face select mask to turn off yet--and it doesn't have the correct icon. There will definitely be an update tomorrow to fix the problems with all or most of the issues.
2011-07-12 19:06:06 +00:00
2.5: * Image painting back. 2d paint, 3d paint and projection, undo, pressure, repeating paint operations, etc should all work. Drawing cursor needs a bit of work, only gets shown when enabling texture paint mode now. * Move sculpt, image paint, and vertex/weight paint into a single sculpt_paint module. Doesn't make much difference now, but nice to have it together for better integration and consistency in the future.
2009-02-19 23:53:40 +00:00
/* vertex */
WM_operatortype_append(PAINT_OT_vertex_paint_toggle);
WM_operatortype_append(PAINT_OT_vertex_paint);
2.5/Vertex paint: * Added operator for filling vertex colors with the brush color * Pythonized the vertex paint menu
2009-08-22 02:27:37 +00:00
WM_operatortype_append(PAINT_OT_vertex_color_set);
face mask mode - border select - linked selection (Ctrl+L) - select all
2009-10-22 19:17:46 +00:00
/* face-select */
WM_operatortype_append(PAINT_OT_face_select_linked);
WM_operatortype_append(PAINT_OT_face_select_linked_pick);
1. Extend option for 3d view border select now does something (default True to keep same behavior) 2. Add action parameter to Select_All_Toggle operators, rename to Select_All. Options are Toggle (default), Select, Deselect, Invert (same as select swap). This makes it possible to map separate hotkeys for select all and deselect all. NOTE for Aligorith: I didn't change animation operators for select_all which already had an Invert operator. These should be fixed eventually.
2009-11-29 22:16:29 +00:00
WM_operatortype_append(PAINT_OT_face_select_all);
face-paint mode operators were not ported from 2.4x yet hide/reveal/sel-swap also added hide-unselected option to armature mode.
2011-02-24 16:04:36 +00:00
WM_operatortype_append(PAINT_OT_face_select_inverse);
WM_operatortype_append(PAINT_OT_face_select_hide);
WM_operatortype_append(PAINT_OT_face_select_reveal);
2.5: * Image painting back. 2d paint, 3d paint and projection, undo, pressure, repeating paint operations, etc should all work. Drawing cursor needs a bit of work, only gets shown when enabling texture paint mode now. * Move sculpt, image paint, and vertex/weight paint into a single sculpt_paint module. Doesn't make much difference now, but nice to have it together for better integration and consistency in the future.
2009-02-19 23:53:40 +00:00
}
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
static void ed_keymap_paint_brush_switch(wmKeyMap *keymap, const char *mode)
use number keys to set the current brush in paint modes
2009-11-17 16:04:17 +00:00
{
wmKeyMapItem *kmi;
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", ONEKEY, KM_PRESS, 0, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 0);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", TWOKEY, KM_PRESS, 0, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 1);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", THREEKEY, KM_PRESS, 0, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 2);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", FOURKEY, KM_PRESS, 0, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 3);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", FIVEKEY, KM_PRESS, 0, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 4);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", SIXKEY, KM_PRESS, 0, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 5);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", SEVENKEY, KM_PRESS, 0, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 6);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", EIGHTKEY, KM_PRESS, 0, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 7);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", NINEKEY, KM_PRESS, 0, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 8);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", ZEROKEY, KM_PRESS, 0, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 9);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", ONEKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 10);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", TWOKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 11);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", THREEKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 12);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", FOURKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 13);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", FIVEKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 14);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", SIXKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 15);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", SEVENKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 16);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", EIGHTKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 17);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", NINEKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 18);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_active_index_set", ZEROKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
RNA_string_set(kmi->ptr, "mode", mode);
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_int_set(kmi->ptr, "index", 19);
use number keys to set the current brush in paint modes
2009-11-17 16:04:17 +00:00
}
most unused arg warnings corrected. - removed deprecated bitmap arg from IMB_allocImBuf (plugins will need updating). - mostly tagged UNUSED() since some of these functions look like they may need to have the arguments used later.
2010-10-16 14:32:17 +00:00
static void ed_keymap_paint_brush_size(wmKeyMap *keymap, const char *UNUSED(path))
* Added new hotkeys [ and ] to decrease/increase brush size by 20 in all paint modes. The actual value to increment/decrement by can be customised in key maps.
2010-01-04 00:18:08 +00:00
{
wmKeyMapItem *kmi;
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_scale_size", LEFTBRACKETKEY, KM_PRESS, 0, 0);
RNA_float_set(kmi->ptr, "scalar", 0.9);
kmi= WM_keymap_add_item(keymap, "BRUSH_OT_scale_size", RIGHTBRACKETKEY, KM_PRESS, 0, 0);
RNA_float_set(kmi->ptr, "scalar", 10.0/9.0); // 1.1111....
}
* Added new hotkeys [ and ] to decrease/increase brush size by 20 in all paint modes. The actual value to increment/decrement by can be customised in key maps.
2010-01-04 00:18:08 +00:00
== Radial control == Patch to make the radial control more generic with RNA. Patch was reviewed here: http://codereview.appspot.com/4280080/ Prior to this update, the radial control code in trunk had generic parts of the radial control implemented as an incomplete operator within WM. Then each different user of the radial control had to implement a separate operator to actually pass in specific brush data -- e.g. sculpt's brush size, vpaint's brush size, etc. This patch removes all the extra operators and makes the WM operator do everything. It now takes several RNA path strings as its properties -- the only required property is data_path, which specifies the data to be modified by the radial control. The other paths affect display in various ways, e.g. rotation, color, etc. In addition to decreasing some duplicate paint brush code, these updates make it pretty easy to enable radial control for other purposes (and it can be set up entirely though python or keymaps, no extra C code needed.)
2011-05-12 01:57:47 +00:00
typedef enum {
RC_COLOR = 1,
RC_ROTATION = 2,
RC_ZOOM = 4,
} RCFlags;
static void set_brush_rc_path(PointerRNA *ptr, const char *brush_path,
const char *output_name, const char *input_name)
{
char *path;
path = BLI_sprintfN("%s.%s", brush_path, input_name);
RNA_string_set(ptr, output_name, path);
MEM_freeN(path);
}
static void set_brush_rc_props(PointerRNA *ptr, const char *paint,
const char *prop, RCFlags flags)
{
char *brush_path;
brush_path = BLI_sprintfN("tool_settings.%s.brush", paint);
set_brush_rc_path(ptr, brush_path, "data_path", prop);
set_brush_rc_path(ptr, brush_path, "color_path", "cursor_color_add");
set_brush_rc_path(ptr, brush_path, "rotation_path", "texture_slot.angle");
RNA_string_set(ptr, "image_id", brush_path);
if(flags & RC_COLOR)
set_brush_rc_path(ptr, brush_path, "fill_color_path", "color");
if(flags & RC_ZOOM)
RNA_string_set(ptr, "zoom_path", "space_data.zoom");
MEM_freeN(brush_path);
}
static void ed_keymap_paint_brush_radial_control(wmKeyMap *keymap, const char *paint,
RCFlags flags)
{
wmKeyMapItem *kmi;
kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, 0, 0);
set_brush_rc_props(kmi->ptr, paint, "size", flags);
kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0);
set_brush_rc_props(kmi->ptr, paint, "strength", flags);
if(flags & RC_ROTATION) {
kmi = WM_keymap_add_item(keymap, "WM_OT_radial_control", FKEY, KM_PRESS, KM_CTRL, 0);
set_brush_rc_props(kmi->ptr, paint, "texture_slot.angle", flags);
}
}
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 ED_keymap_paint(wmKeyConfig *keyconf)
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
{
wmKeyMap *keymap;
key shortcits for sculpt back - T was 'Flatten Brush', now Shift+T - added an option to OBJECT_OT_subdivision_set to set the level relatively (so page up/down works), however RNA lets it set one level higher then the maximum, this seems displays OK in the 3D view so not sure whats going on here (as if there is always an extra hidden multires level).
2009-12-23 12:13:48 +00:00
wmKeyMapItem *kmi;
Sculpt Branch: Subdivision set with Ctrl+1-5 now works for multires as well.
2009-12-07 19:56:59 +00:00
int i;
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
/* Sculpt mode */
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
keymap= WM_keymap_find(keyconf, "Sculpt", 0, 0);
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
keymap->poll= sculpt_poll;
Paint/Sculpt: More minor cleanups: fixed names and factored out a function that was copy-pasted into paint stroke.
2011-01-07 22:46:52 +00:00
RNA_enum_set(WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE, KM_PRESS, 0, 0)->ptr, "mode", BRUSH_STROKE_NORMAL);
RNA_enum_set(WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE, KM_PRESS, KM_CTRL, 0)->ptr, "mode", BRUSH_STROKE_INVERT);
RNA_enum_set(WM_keymap_add_item(keymap, "SCULPT_OT_brush_stroke", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", BRUSH_STROKE_SMOOTH);
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
key shortcits for sculpt back - T was 'Flatten Brush', now Shift+T - added an option to OBJECT_OT_subdivision_set to set the level relatively (so page up/down works), however RNA lets it set one level higher then the maximum, this seems displays OK in the 3D view so not sure whats going on here (as if there is always an extra hidden multires level).
2009-12-23 12:13:48 +00:00
for(i=0; i<=5; i++)
Sculpt Branch: Subdivision set with Ctrl+1-5 now works for multires as well.
2009-12-07 19:56:59 +00:00
RNA_int_set(WM_keymap_add_item(keymap, "OBJECT_OT_subdivision_set", ZEROKEY+i, KM_PRESS, KM_CTRL, 0)->ptr, "level", i);
key shortcits for sculpt back - T was 'Flatten Brush', now Shift+T - added an option to OBJECT_OT_subdivision_set to set the level relatively (so page up/down works), however RNA lets it set one level higher then the maximum, this seems displays OK in the 3D view so not sure whats going on here (as if there is always an extra hidden multires level).
2009-12-23 12:13:48 +00:00
/* multires switch */
kmi= WM_keymap_add_item(keymap, "OBJECT_OT_subdivision_set", PAGEUPKEY, KM_PRESS, 0, 0);
RNA_int_set(kmi->ptr, "level", 1);
RNA_boolean_set(kmi->ptr, "relative", 1);
kmi= WM_keymap_add_item(keymap, "OBJECT_OT_subdivision_set", PAGEDOWNKEY, KM_PRESS, 0, 0);
RNA_int_set(kmi->ptr, "level", -1);
RNA_boolean_set(kmi->ptr, "relative", 1);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
ed_keymap_paint_brush_switch(keymap, "sculpt");
* Added new hotkeys [ and ] to decrease/increase brush size by 20 in all paint modes. The actual value to increment/decrement by can be customised in key maps.
2010-01-04 00:18:08 +00:00
ed_keymap_paint_brush_size(keymap, "tool_settings.sculpt.brush.size");
== Radial control == Patch to make the radial control more generic with RNA. Patch was reviewed here: http://codereview.appspot.com/4280080/ Prior to this update, the radial control code in trunk had generic parts of the radial control implemented as an incomplete operator within WM. Then each different user of the radial control had to implement a separate operator to actually pass in specific brush data -- e.g. sculpt's brush size, vpaint's brush size, etc. This patch removes all the extra operators and makes the WM operator do everything. It now takes several RNA path strings as its properties -- the only required property is data_path, which specifies the data to be modified by the radial control. The other paths affect display in various ways, e.g. rotation, color, etc. In addition to decreasing some duplicate paint brush code, these updates make it pretty easy to enable radial control for other purposes (and it can be set up entirely though python or keymaps, no extra C code needed.)
2011-05-12 01:57:47 +00:00
ed_keymap_paint_brush_radial_control(keymap, "sculpt", RC_ROTATION);
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
Add back sculpt mode brush keys. Operator for switching brushes based on type, cycling through brushes when multiple exist. This has the advantages over the old method that it doenst rely on hard coded brush names and if there are multiple brushes of the same type it cycles between them. also fix error in previous commit which broke number buttons changing brushes.
2011-04-01 06:14:39 +00:00
RNA_enum_set(WM_keymap_add_item(keymap, "BRUSH_OT_sculpt_tool_set", DKEY, KM_PRESS, 0, 0)->ptr, "tool", SCULPT_TOOL_DRAW);
RNA_enum_set(WM_keymap_add_item(keymap, "BRUSH_OT_sculpt_tool_set", SKEY, KM_PRESS, 0, 0)->ptr, "tool", SCULPT_TOOL_SMOOTH);
RNA_enum_set(WM_keymap_add_item(keymap, "BRUSH_OT_sculpt_tool_set", PKEY, KM_PRESS, 0, 0)->ptr, "tool", SCULPT_TOOL_PINCH);
RNA_enum_set(WM_keymap_add_item(keymap, "BRUSH_OT_sculpt_tool_set", IKEY, KM_PRESS, 0, 0)->ptr, "tool", SCULPT_TOOL_INFLATE);
RNA_enum_set(WM_keymap_add_item(keymap, "BRUSH_OT_sculpt_tool_set", GKEY, KM_PRESS, 0, 0)->ptr, "tool", SCULPT_TOOL_GRAB);
RNA_enum_set(WM_keymap_add_item(keymap, "BRUSH_OT_sculpt_tool_set", LKEY, KM_PRESS, 0, 0)->ptr, "tool", SCULPT_TOOL_LAYER);
RNA_enum_set(WM_keymap_add_item(keymap, "BRUSH_OT_sculpt_tool_set", TKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "tool", SCULPT_TOOL_FLATTEN); /* was just TKEY in 2.4x */
RNA_enum_set(WM_keymap_add_item(keymap, "BRUSH_OT_sculpt_tool_set", CKEY, KM_PRESS, 0, 0)->ptr, "tool", SCULPT_TOOL_CLAY);
RNA_enum_set(WM_keymap_add_item(keymap, "BRUSH_OT_sculpt_tool_set", CKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "tool", SCULPT_TOOL_CREASE);
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
/* */
- Do not use old anchor toggling operator. It used to set brush flags to unawaliable state. - Also changed dynamic space bar menu, so it now also wouldn't allow to set brush stroke flags to unavaliable state. Also tried to remove use_anchor, use_space, use_restore_mesh and use_airbrush, so user would be unable to set flags to unavaliable state, but it was quite difficult for non-sculpt paint modes. They don't support all of stroke methods, so brush.stroke_method can't be used for them. Keep this area unchanged for now.
2011-02-15 19:19:36 +00:00
kmi = WM_keymap_add_item(keymap, "WM_OT_context_menu_enum", AKEY, KM_PRESS, 0, 0);
RNA_string_set(kmi->ptr, "data_path", "tool_settings.sculpt.brush.stroke_method");
key shortcits for sculpt back - T was 'Flatten Brush', now Shift+T - added an option to OBJECT_OT_subdivision_set to set the level relatively (so page up/down works), however RNA lets it set one level higher then the maximum, this seems displays OK in the 3D view so not sure whats going on here (as if there is always an extra hidden multires level).
2009-12-23 12:13:48 +00:00
kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", SKEY, KM_PRESS, KM_SHIFT, 0);
naming changes path -> filepath (for rna and operators, as agreed on with elubie) path -> data_path (for windowmanager context functions, this was alredy used in many places)
2010-06-14 03:52:10 +00:00
RNA_string_set(kmi->ptr, "data_path", "tool_settings.sculpt.brush.use_smooth_stroke");
key shortcits for sculpt back - T was 'Flatten Brush', now Shift+T - added an option to OBJECT_OT_subdivision_set to set the level relatively (so page up/down works), however RNA lets it set one level higher then the maximum, this seems displays OK in the 3D view so not sure whats going on here (as if there is always an extra hidden multires level).
2009-12-23 12:13:48 +00:00
Use enum menu for angle source in sculpt mode -- rake toggling wasn't working due to it's 3 possible sources.
2011-05-02 08:04:05 +00:00
kmi = WM_keymap_add_item(keymap, "WM_OT_context_menu_enum", RKEY, KM_PRESS, 0, 0);
RNA_string_set(kmi->ptr, "data_path", "tool_settings.sculpt.brush.texture_angle_source_random");
fix for a crash when running blender in debug mode (-d arg), was registering every operator in debug mode. added some more sculpt key shortcuts * R toggles rake * Shift+A toggles airbrush note: last commit added Ctrl+0 to set zero subsurf and multires
2009-12-23 15:06:47 +00:00
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
/* Vertex Paint mode */
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
keymap= WM_keymap_find(keyconf, "Vertex Paint", 0, 0);
Assign automatic/envelope weights in weight paint mode is back, accessible from W key and in new Weights menu in the header.
2010-01-26 11:11:53 +00:00
keymap->poll= vertex_paint_mode_poll;
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
WM_keymap_verify_item(keymap, "PAINT_OT_vertex_paint", LEFTMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "PAINT_OT_sample_color", RIGHTMOUSE, KM_PRESS, 0, 0);
added back face mask mouse selection and made shift+k fill weight paint and vertex color
2009-10-22 12:59:14 +00:00
WM_keymap_add_item(keymap,
"PAINT_OT_vertex_color_set",KKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
ed_keymap_paint_brush_switch(keymap, "vertex_paint");
* Added new hotkeys [ and ] to decrease/increase brush size by 20 in all paint modes. The actual value to increment/decrement by can be customised in key maps.
2010-01-04 00:18:08 +00:00
ed_keymap_paint_brush_size(keymap, "tool_settings.vertex_paint.brush.size");
== Radial control == Patch to make the radial control more generic with RNA. Patch was reviewed here: http://codereview.appspot.com/4280080/ Prior to this update, the radial control code in trunk had generic parts of the radial control implemented as an incomplete operator within WM. Then each different user of the radial control had to implement a separate operator to actually pass in specific brush data -- e.g. sculpt's brush size, vpaint's brush size, etc. This patch removes all the extra operators and makes the WM operator do everything. It now takes several RNA path strings as its properties -- the only required property is data_path, which specifies the data to be modified by the radial control. The other paths affect display in various ways, e.g. rotation, color, etc. In addition to decreasing some duplicate paint brush code, these updates make it pretty easy to enable radial control for other purposes (and it can be set up entirely though python or keymaps, no extra C code needed.)
2011-05-12 01:57:47 +00:00
ed_keymap_paint_brush_radial_control(keymap, "vertex_paint", RC_COLOR);
use number keys to set the current brush in paint modes
2009-11-17 16:04:17 +00:00
Mkey toggles mask while in vertex/texture/weight paint mode. remove unused operator property
2010-01-14 18:11:10 +00:00
kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", MKEY, KM_PRESS, 0, 0); /* mask toggle */
naming changes path -> filepath (for rna and operators, as agreed on with elubie) path -> data_path (for windowmanager context functions, this was alredy used in many places)
2010-06-14 03:52:10 +00:00
RNA_string_set(kmi->ptr, "data_path", "vertex_paint_object.data.use_paint_mask");
Mkey toggles mask while in vertex/texture/weight paint mode. remove unused operator property
2010-01-14 18:11:10 +00:00
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
/* Weight Paint mode */
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
keymap= WM_keymap_find(keyconf, "Weight Paint", 0, 0);
Assign automatic/envelope weights in weight paint mode is back, accessible from W key and in new Weights menu in the header.
2010-01-26 11:11:53 +00:00
keymap->poll= weight_paint_mode_poll;
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
WM_keymap_verify_item(keymap, "PAINT_OT_weight_paint", LEFTMOUSE, KM_PRESS, 0, 0);
fix [#27479] Missing 'Select vertex groups under the cursor' in weight paint mode really todo :) but still needs to be done. Split this into 2 operators, works like 2.4x - Ctrl+LMB samples weight. - Shift+LMB selects vertex groups.
2011-05-25 10:07:59 +00:00
/* these keys are from 2.4x but could be changed */
WM_keymap_verify_item(keymap, "PAINT_OT_weight_sample", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
WM_keymap_verify_item(keymap, "PAINT_OT_weight_sample_group", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
added back face mask mouse selection and made shift+k fill weight paint and vertex color
2009-10-22 12:59:14 +00:00
WM_keymap_add_item(keymap,
"PAINT_OT_weight_set", KKEY, KM_PRESS, KM_SHIFT, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
ed_keymap_paint_brush_switch(keymap, "weight_paint");
* Added new hotkeys [ and ] to decrease/increase brush size by 20 in all paint modes. The actual value to increment/decrement by can be customised in key maps.
2010-01-04 00:18:08 +00:00
ed_keymap_paint_brush_size(keymap, "tool_settings.weight_paint.brush.size");
== Radial control == Patch to make the radial control more generic with RNA. Patch was reviewed here: http://codereview.appspot.com/4280080/ Prior to this update, the radial control code in trunk had generic parts of the radial control implemented as an incomplete operator within WM. Then each different user of the radial control had to implement a separate operator to actually pass in specific brush data -- e.g. sculpt's brush size, vpaint's brush size, etc. This patch removes all the extra operators and makes the WM operator do everything. It now takes several RNA path strings as its properties -- the only required property is data_path, which specifies the data to be modified by the radial control. The other paths affect display in various ways, e.g. rotation, color, etc. In addition to decreasing some duplicate paint brush code, these updates make it pretty easy to enable radial control for other purposes (and it can be set up entirely though python or keymaps, no extra C code needed.)
2011-05-12 01:57:47 +00:00
ed_keymap_paint_brush_radial_control(keymap, "weight_paint", 0);
use number keys to set the current brush in paint modes
2009-11-17 16:04:17 +00:00
minor edits to previous commit & set VKey to toggle vertex select in weight paint mode.
2011-12-20 02:04:35 +00:00
kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", MKEY, KM_PRESS, 0, 0); /* face mask toggle */
naming changes path -> filepath (for rna and operators, as agreed on with elubie) path -> data_path (for windowmanager context functions, this was alredy used in many places)
2010-06-14 03:52:10 +00:00
RNA_string_set(kmi->ptr, "data_path", "weight_paint_object.data.use_paint_mask");
Mkey toggles mask while in vertex/texture/weight paint mode. remove unused operator property
2010-01-14 18:11:10 +00:00
minor edits to previous commit & set VKey to toggle vertex select in weight paint mode.
2011-12-20 02:04:35 +00:00
/* note, conflicts with vertex paint, but this is more useful */
kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", VKEY, KM_PRESS, 0, 0); /* vert mask toggle */
RNA_string_set(kmi->ptr, "data_path", "weight_paint_object.data.use_paint_mask_vertex");
Assign automatic/envelope weights in weight paint mode is back, accessible from W key and in new Weights menu in the header.
2010-01-26 11:11:53 +00:00
WM_keymap_verify_item(keymap, "PAINT_OT_weight_from_bones", WKEY, KM_PRESS, 0, 0);
Split do_weight_paint_vertex() to isolate the simple case. Added a tool-tip to the "fix deforms" op. Removed code markers: "Radish"
2011-09-18 17:10:28 +00:00
Made a vertex selection keymap for weight paint so that the 'A' key could override pose mode's select all (like face mask) Minor note, changed the icon to the vertex selection icon, but it still doesn't force face mask to turn off. Clipping is still not functional in wp. And I'll need to hear how the backbuffer select is supposed to work for lasso select since the selection is arbitrary.
2011-07-13 20:45:09 +00:00
/*Weight paint's Vertex Selection Mode */
keymap= WM_keymap_find(keyconf, "Weight Paint Vertex Selection", 0, 0);
keymap->poll= vert_paint_poll;
WM_keymap_add_item(keymap, "PAINT_OT_vert_select_all", AKEY, KM_PRESS, 0, 0);
I made multitude of fixes based on the comments provided online: Removed the drawSelectedVerts and added drawSelectedVertices, which uses dm->foreachMappedVert. In calc_weightpaint_vert_color(): Made the weight paint color black and return instead of input=-1 Made the pose bone selection normal when multi-paint is inactive. Name fix for functions using mv instead of mvert. Used vector functions provided by the math lib. Changed some MEM_callocN references to be stacks. Changed dm_deform_clear to use ob->derivedDeform primarily Made the variable "float **changes" into "float (*changes)[2]" Used CTX_data_active_object() in place of CTX_data_pointer_get_type() Added the invert selection hotkey "Ctrl+I" to weight paint's vertex mask.
2011-09-18 01:09:18 +00:00
WM_keymap_add_item(keymap, "PAINT_OT_vert_select_inverse", IKEY, KM_PRESS, KM_CTRL, 0);
Made a vertex selection keymap for weight paint so that the 'A' key could override pose mode's select all (like face mask) Minor note, changed the icon to the vertex selection icon, but it still doesn't force face mask to turn off. Clipping is still not functional in wp. And I'll need to hear how the backbuffer select is supposed to work for lasso select since the selection is arbitrary.
2011-07-13 20:45:09 +00:00
WM_keymap_add_item(keymap, "VIEW3D_OT_select_border", BKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "VIEW3D_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_CTRL, 0);
RNA_boolean_set(WM_keymap_add_item(keymap, "VIEW3D_OT_select_lasso", EVT_TWEAK_A, KM_ANY, KM_SHIFT|KM_CTRL, 0)->ptr, "deselect", 1);
Lots of incomplete changes: Weight Paint Vertex Select tweaked to act like edit mode's select and Circle select was added, but clipping is not working properly for either. Select all was added too, but to the Q key until I look into overriding A's select all bones. The select vertices checkbox was moved to the header, but it does not force face select mask to turn off yet--and it doesn't have the correct icon. There will definitely be an update tomorrow to fix the problems with all or most of the issues.
2011-07-12 19:06:06 +00:00
WM_keymap_add_item(keymap, "VIEW3D_OT_select_circle", CKEY, KM_PRESS, 0, 0);
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
/* Image/Texture Paint mode */
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
keymap= WM_keymap_find(keyconf, "Image Paint", 0, 0);
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
keymap->poll= image_texture_paint_poll;
WM_keymap_add_item(keymap, "PAINT_OT_image_paint", LEFTMOUSE, KM_PRESS, 0, 0);
Fix #20926: 2d image paint was missing clone image, clone alpha, and wrap option in the UI, also fixes missing refresh when changing these and wrong order in keymap for clone grabbing operator.
2010-02-02 17:41:32 +00:00
WM_keymap_add_item(keymap, "PAINT_OT_grab_clone", RIGHTMOUSE, KM_PRESS, 0, 0);
Handlers/keymaps, some tweaks for previous commits: * Screen keymap is now split up in two, some of the area/region manipulation operators here need to be handled before others. * Moved paint/sculpt/sketch out of the 3d view keymap, these were there as a workaround, now with keymap poll no longer needed. * Also fixes #19297, 3d cursor moves when combing in particle mode.
2009-09-18 15:48:49 +00:00
WM_keymap_add_item(keymap, "PAINT_OT_sample_color", RIGHTMOUSE, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "PAINT_OT_clone_cursor_set", LEFTMOUSE, KM_PRESS, KM_CTRL, 0);
Fix #24632: Sculpt Mode Context Set hotkeys (1..0, Shift+1..0) don't work - Totally get rid of old active_brush_index stuff - Use operator to set n-th brush as active in specified paint mode thans to Cambo for it's optimization :)
2010-11-10 08:11:58 +00:00
ed_keymap_paint_brush_switch(keymap, "image_paint");
* Added new hotkeys [ and ] to decrease/increase brush size by 20 in all paint modes. The actual value to increment/decrement by can be customised in key maps.
2010-01-04 00:18:08 +00:00
ed_keymap_paint_brush_size(keymap, "tool_settings.image_paint.brush.size");
== Radial control == Patch to make the radial control more generic with RNA. Patch was reviewed here: http://codereview.appspot.com/4280080/ Prior to this update, the radial control code in trunk had generic parts of the radial control implemented as an incomplete operator within WM. Then each different user of the radial control had to implement a separate operator to actually pass in specific brush data -- e.g. sculpt's brush size, vpaint's brush size, etc. This patch removes all the extra operators and makes the WM operator do everything. It now takes several RNA path strings as its properties -- the only required property is data_path, which specifies the data to be modified by the radial control. The other paths affect display in various ways, e.g. rotation, color, etc. In addition to decreasing some duplicate paint brush code, these updates make it pretty easy to enable radial control for other purposes (and it can be set up entirely though python or keymaps, no extra C code needed.)
2011-05-12 01:57:47 +00:00
ed_keymap_paint_brush_radial_control(keymap, "image_paint", RC_COLOR|RC_ZOOM);
use number keys to set the current brush in paint modes
2009-11-17 16:04:17 +00:00
Mkey toggles mask while in vertex/texture/weight paint mode. remove unused operator property
2010-01-14 18:11:10 +00:00
kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", MKEY, KM_PRESS, 0, 0); /* mask toggle */
while looking into adding back brush tool keys found mixed texture/image paint rna vars, using 'image paint' internally.
2011-04-01 04:22:30 +00:00
RNA_string_set(kmi->ptr, "data_path", "image_paint_object.data.use_paint_mask");
Mkey toggles mask while in vertex/texture/weight paint mode. remove unused operator property
2010-01-14 18:11:10 +00:00
face mask mode - border select - linked selection (Ctrl+L) - select all
2009-10-22 19:17:46 +00:00
/* face-mask mode */
keymap= WM_keymap_find(keyconf, "Face Mask", 0, 0);
keymap->poll= facemask_paint_poll;
1. Extend option for 3d view border select now does something (default True to keep same behavior) 2. Add action parameter to Select_All_Toggle operators, rename to Select_All. Options are Toggle (default), Select, Deselect, Invert (same as select swap). This makes it possible to map separate hotkeys for select all and deselect all. NOTE for Aligorith: I didn't change animation operators for select_all which already had an Invert operator. These should be fixed eventually.
2009-11-29 22:16:29 +00:00
WM_keymap_add_item(keymap, "PAINT_OT_face_select_all", AKEY, KM_PRESS, 0, 0);
face-paint mode operators were not ported from 2.4x yet hide/reveal/sel-swap also added hide-unselected option to armature mode.
2011-02-24 16:04:36 +00:00
WM_keymap_add_item(keymap, "PAINT_OT_face_select_inverse", IKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "PAINT_OT_face_select_hide", HKEY, KM_PRESS, 0, 0);
RNA_boolean_set(WM_keymap_add_item(keymap, "PAINT_OT_face_select_hide", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1);
WM_keymap_add_item(keymap, "PAINT_OT_face_select_reveal", HKEY, KM_PRESS, KM_ALT, 0);
face mask mode - border select - linked selection (Ctrl+L) - select all
2009-10-22 19:17:46 +00:00
WM_keymap_add_item(keymap, "PAINT_OT_face_select_linked", LKEY, KM_PRESS, KM_CTRL, 0);
WM_keymap_add_item(keymap, "PAINT_OT_face_select_linked_pick", LKEY, KM_PRESS, 0, 0);
}
Copy Permalink