Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2013-03-06 23:54:43 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-03-06 23:54:43 +0400
commit8676530b7d035d9ecb4e518d084790a4d305ec35 (patch)
tree1ebb9b884a75096c52876cf705800c3ce8bea55b /source/blender/editors/sculpt_paint/paint_ops.c
parentc75065136c03a4cb65709c87b66579190c6bdeee (diff)
Texture paint refactoring commit
Adding new file paint_image_proj.c which includes the projective texture painting part of texture painting, using the stroke system. To access the new code path use Shift-LClick. The new code path still is problematic with tablet pressure and I will be looking into ways to unify this across paint systems next. The old code is still present and can be accessed by regular Lclick as usual. Also removed 3D (non-projective) painting from 3D viewport. TODO: * Add pressure influence code to stroke, remove from every other paint system code, including texpaint. * Put UnifiedPaintSettings update in PaintStroke code.
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_ops.c')
-rw-r--r--source/blender/editors/sculpt_paint/paint_ops.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c
index 7385c2f0cf1..4d350e2fe3a 100644
--- a/source/blender/editors/sculpt_paint/paint_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_ops.c
@@ -465,6 +465,7 @@ void ED_operatortypes_paint(void)
/* image */
WM_operatortype_append(PAINT_OT_texture_paint_toggle);
WM_operatortype_append(PAINT_OT_image_paint);
+ WM_operatortype_append(PAINT_OT_image_paint_proj);
WM_operatortype_append(PAINT_OT_sample_color);
WM_operatortype_append(PAINT_OT_grab_clone);
WM_operatortype_append(PAINT_OT_clone_cursor_set);
@@ -760,6 +761,7 @@ void ED_keymap_paint(wmKeyConfig *keyconf)
keymap->poll = image_texture_paint_poll;
WM_keymap_add_item(keymap, "PAINT_OT_image_paint", LEFTMOUSE, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "PAINT_OT_image_paint_proj", LEFTMOUSE, KM_PRESS, KM_SHIFT, 0);
WM_keymap_add_item(keymap, "PAINT_OT_grab_clone", RIGHTMOUSE, KM_PRESS, 0, 0);
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);