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
704c5f09b5b9eb79b591bb7996944c22085f0b15
blender-archive/source/blender/editors/sculpt_paint/paint_vertex.c

2986 lines
81 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 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +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 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
*
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
* All rights reserved.
*
* The Original Code is: all of this file.
*
* Contributor(s): none yet.
*
* ***** END GPL LICENSE BLOCK *****
*/
doxygen: blender/editors tagged.
2011-02-27 20:29:51 +00:00
/** \file blender/editors/sculpt_paint/paint_vertex.c
* \ingroup edsculpt
*/
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
#include <math.h>
#include <string.h>
#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#endif
#include "MEM_guardedalloc.h"
#include "BLI_blenlib.h"
Math Lib * Convert all code to use new functions. * Branch maintainers may want to skip this commit, and run this conversion script instead, if they use a lot of math functions in new code: http://www.pasteall.org/9052/python
2009-11-10 20:43:45 +00:00
#include "BLI_math.h"
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
#include "BLI_memarena.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"
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
#include "BLI_ghash.h"
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
- remove unused includes IMB_*, BIF_* & MEM_* - remove MEM_guardedalloc.h from header files (include directly)
2010-08-16 05:46:10 +00:00
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
#include "DNA_armature_types.h"
#include "DNA_mesh_types.h"
#include "DNA_particle_types.h"
header re-shuffle, some headers contained unneeded refereces to other headers, better include inline with the C files that need them
2010-08-10 05:41:51 +00:00
#include "DNA_scene_types.h"
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
#include "DNA_brush_types.h"
header re-shuffle, some headers contained unneeded refereces to other headers, better include inline with the C files that need them
2010-08-10 05:41:51 +00:00
#include "DNA_object_types.h"
#include "DNA_meshdata_types.h"
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
Added radial control support to vpaint and wpaint. Added undo pushes as well.
2009-01-25 21:02:52 +00:00
#include "RNA_access.h"
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
#include "RNA_define.h"
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
#include "RNA_enum_types.h"
Added radial control support to vpaint and wpaint. Added undo pushes as well.
2009-01-25 21:02:52 +00:00
header re-shuffle, some headers contained unneeded refereces to other headers, better include inline with the C files that need them
2010-08-10 05:41:51 +00:00
#include "BKE_DerivedMesh.h"
initial cleanup for weight paint branch - move get_selected_defgroups & count_selected_defgroups into blenkernel - split calc_weightpaint_vert_color() logic so its more obvious whats default and multipaint behavior
2011-09-14 02:04:26 +00:00
#include "BKE_armature.h"
revert for last commit, this should fix the proplem properly. - selected bones on hidden layers would be selected for weight painting (confusing to the user). use the 'active' bone instead. - when no weight group was set, the index used for the bone group was off by 1.
2010-01-18 16:21:23 +00:00
#include "BKE_action.h"
Changed vertexpaint and weightpaint to use the standard Brush struct, so they too work with the brush panel. Note: these modes are only using color/alpha/size from Brush, so there's more integration work todo yet.
2009-03-11 00:43:08 +00:00
#include "BKE_brush.h"
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
#include "BKE_context.h"
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
#include "BKE_depsgraph.h"
#include "BKE_deform.h"
#include "BKE_mesh.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
code cleanup: move functions for getting defgroup arrays from objects out of editors into blenkernel, since they are generally useful.
2012-09-05 02:51:55 +00:00
#include "BKE_object_deform.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 "BKE_paint.h"
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
#include "BKE_report.h"
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
#include "WM_api.h"
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
#include "WM_types.h"
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
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
#include "ED_armature.h"
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
#include "ED_mesh.h"
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
#include "ED_screen.h"
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
#include "ED_view3d.h"
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
#include "paint_intern.h"
* Fixed some typos in the code, patch [#30247] by Vladimir Rutsky (rutsky). Thanks!
2012-02-23 09:23:29 +00:00
/* check if we can do partial updates and have them draw realtime
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
* (without rebuilding the 'derivedFinal') */
static int vertex_paint_use_fast_update_check(Object *ob)
{
DerivedMesh *dm = ob->derivedFinal;
if (dm) {
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
Mesh *me = BKE_mesh_from_object(ob);
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
if (me && me->mcol) {
return (me->mcol == CustomData_get_layer(&dm->faceData, CD_MCOL));
}
}
return FALSE;
}
/* if the polygons from the mesh and the 'derivedFinal' match
spelling cleanup
2012-03-18 07:38:51 +00:00
* we can assume that no modifiers are applied and that its worth adding tessellated faces
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
* so 'vertex_paint_use_fast_update_check()' returns TRUE */
static int vertex_paint_use_tessface_check(Object *ob)
{
DerivedMesh *dm = ob->derivedFinal;
Added radial control support to vpaint and wpaint. Added undo pushes as well.
2009-01-25 21:02:52 +00:00
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
if (dm) {
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
Mesh *me = BKE_mesh_from_object(ob);
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
return (me->mpoly == CustomData_get_layer(&dm->faceData, CD_MPOLY));
}
return FALSE;
}
/* polling - retrieve whether cursor should be set or operator should be done */
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
/* Returns true if vertex paint mode is active */
int vertex_paint_mode_poll(bContext *C)
Added radial control support to vpaint and wpaint. Added undo pushes as well.
2009-01-25 21:02:52 +00:00
{
2.5/Vertex paint: * Made vertex paint local to object, like sculpt mode. * New test for vertex paint is (ob->mode & OB_MODE_VERTEX_PAINT)
2009-08-15 20:36:15 +00:00
Object *ob = CTX_data_active_object(C);
svn merge ^/trunk/blender -r42973:42991
2011-12-30 09:23:06 +00:00
return ob && ob->mode == OB_MODE_VERTEX_PAINT && ((Mesh *)ob->data)->totpoly;
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
}
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
int vertex_paint_poll(bContext *C)
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
{
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (vertex_paint_mode_poll(C) &&
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
paint_brush(&CTX_data_tool_settings(C)->vpaint->paint))
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
ScrArea *sa = CTX_wm_area(C);
if (sa->spacetype == SPACE_VIEW3D) {
ARegion *ar = CTX_wm_region(C);
if (ar->regiontype == RGN_TYPE_WINDOW)
Added radial control support to vpaint and wpaint. Added undo pushes as well.
2009-01-25 21:02:52 +00:00
return 1;
}
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
}
Added radial control support to vpaint and wpaint. Added undo pushes as well.
2009-01-25 21:02:52 +00:00
return 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
int weight_paint_mode_poll(bContext *C)
{
Object *ob = CTX_data_active_object(C);
svn merge ^/trunk/blender -r42973:42991
2011-12-30 09:23:06 +00:00
return ob && ob->mode == OB_MODE_WEIGHT_PAINT && ((Mesh *)ob->data)->totpoly;
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
}
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
int weight_paint_poll(bContext *C)
Added radial control support to vpaint and wpaint. Added undo pushes as well.
2009-01-25 21:02:52 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Object *ob = CTX_data_active_object(C);
- weight paint poll would crash if no area was found. - don't print a line for each operator run when in background mode. - extrude was using an invalid type for RNA access.
2011-03-22 14:04:47 +00:00
ScrArea *sa;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if ((ob != NULL) &&
(ob->mode & OB_MODE_WEIGHT_PAINT) &&
(paint_brush(&CTX_data_tool_settings(C)->wpaint->paint) != NULL) &&
(sa = CTX_wm_area(C)) &&
(sa->spacetype == SPACE_VIEW3D))
{
ARegion *ar = CTX_wm_region(C);
if (ar->regiontype == RGN_TYPE_WINDOW) {
- weight paint poll would crash if no area was found. - don't print a line for each operator run when in background mode. - extrude was using an invalid type for RNA access.
2011-03-22 14:04:47 +00:00
return 1;
Added radial control support to vpaint and wpaint. Added undo pushes as well.
2009-01-25 21:02:52 +00:00
}
}
return 0;
}
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
static VPaint *new_vpaint(int wpaint)
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
VPaint *vp = MEM_callocN(sizeof(VPaint), "VPaint");
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vp->flag = VP_AREA + VP_SPRAY;
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (wpaint)
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vp->flag = VP_AREA;
Changed vertexpaint and weightpaint to use the standard Brush struct, so they too work with the brush panel. Note: these modes are only using color/alpha/size from Brush, so there's more integration work todo yet.
2009-03-11 00:43:08 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
return vp;
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
Fix #20953: vertex and weight paint mode still had 500k verts limit.
2010-02-06 15:50:53 +00:00
static int *get_indexarray(Mesh *me)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
return MEM_mallocN(sizeof(int) * (me->totpoly + 1), "vertexpaint");
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
unsigned int vpaint_get_current_col(VPaint *vp)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
Brush *brush = paint_brush(&vp->paint);
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned char col[4];
rgb_float_to_uchar(col, brush->rgb);
spelling cleanup
2012-03-18 07:38:51 +00:00
col[3] = 255; /* alpha isn't used, could even be removed to speedup paint a little */
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
return *(unsigned int *)col;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
part one of profiling/optimizing. made cddm not update tesselations itself in cddm_from_mesh. also made BMO_Test/Set/ClearFlag into macros, and tweaked the way normals are calculated.
2009-09-05 06:10:30 +00:00
static void do_shared_vertex_tesscol(Mesh *me)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
/* if no mcol: do not do */
/* if tface: only the involved faces, otherwise all */
fix shared vertex color (used with blur), to work with selection masking.
2012-04-30 21:46:58 +00:00
const int use_face_sel = (me->editflag & ME_EDIT_PAINT_MASK);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
MFace *mface;
int a;
short *scolmain, *scol;
char *mcol;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (me->mcol == NULL || me->totvert == 0 || me->totface == 0) return;
scolmain = MEM_callocN(4 * sizeof(short) * me->totvert, "colmain");
mface = me->mface;
mcol = (char *)me->mcol;
for (a = me->totface; a > 0; a--, mface++, mcol += 16) {
fix shared vertex color (used with blur), to work with selection masking.
2012-04-30 21:46:58 +00:00
if ((use_face_sel == FALSE) || (mface->flag & ME_FACE_SEL)) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
scol = scolmain + 4 * mface->v1;
scol[0]++; scol[1] += mcol[1]; scol[2] += mcol[2]; scol[3] += mcol[3];
scol = scolmain + 4 * mface->v2;
scol[0]++; scol[1] += mcol[5]; scol[2] += mcol[6]; scol[3] += mcol[7];
scol = scolmain + 4 * mface->v3;
scol[0]++; scol[1] += mcol[9]; scol[2] += mcol[10]; scol[3] += mcol[11];
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (mface->v4) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
scol = scolmain + 4 * mface->v4;
scol[0]++; scol[1] += mcol[13]; scol[2] += mcol[14]; scol[3] += mcol[15];
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
}
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
a = me->totvert;
scol = scolmain;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
while (a--) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (scol[0] > 1) {
scol[1] /= scol[0];
scol[2] /= scol[0];
scol[3] /= scol[0];
}
scol += 4;
}
fix shared vertex color (used with blur), to work with selection masking.
2012-04-30 21:46:58 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
mface = me->mface;
mcol = (char *)me->mcol;
for (a = me->totface; a > 0; a--, mface++, mcol += 16) {
Code cleanup: make changes suggested by check_style for sculpt-related files.
2012-05-06 22:12:26 +00:00
if ((use_face_sel == FALSE) || (mface->flag & ME_FACE_SEL)) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
scol = scolmain + 4 * mface->v1;
mcol[1] = scol[1]; mcol[2] = scol[2]; mcol[3] = scol[3];
scol = scolmain + 4 * mface->v2;
mcol[5] = scol[1]; mcol[6] = scol[2]; mcol[7] = scol[3];
scol = scolmain + 4 * mface->v3;
mcol[9] = scol[1]; mcol[10] = scol[2]; mcol[11] = scol[3];
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (mface->v4) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
scol = scolmain + 4 * mface->v4;
mcol[13] = scol[1]; mcol[14] = scol[2]; mcol[15] = scol[3];
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
}
}
MEM_freeN(scolmain);
part one of profiling/optimizing. made cddm not update tesselations itself in cddm_from_mesh. also made BMO_Test/Set/ClearFlag into macros, and tweaked the way normals are calculated.
2009-09-05 06:10:30 +00:00
}
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
void do_shared_vertexcol(Mesh *me, int do_tessface)
part one of profiling/optimizing. made cddm not update tesselations itself in cddm_from_mesh. also made BMO_Test/Set/ClearFlag into macros, and tweaked the way normals are calculated.
2009-09-05 06:10:30 +00:00
{
fix shared vertex color (used with blur), to work with selection masking.
2012-04-30 21:46:58 +00:00
const int use_face_sel = (me->editflag & ME_EDIT_PAINT_MASK);
MPoly *mp;
float (*scol)[4];
int i, j, has_shared = 0;
part one of profiling/optimizing. made cddm not update tesselations itself in cddm_from_mesh. also made BMO_Test/Set/ClearFlag into macros, and tweaked the way normals are calculated.
2009-09-05 06:10:30 +00:00
/* if no mloopcol: do not do */
/* if mtexpoly: only the involved faces, otherwise all */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (me->mloopcol == 0 || me->totvert == 0 || me->totpoly == 0) return;
part one of profiling/optimizing. made cddm not update tesselations itself in cddm_from_mesh. also made BMO_Test/Set/ClearFlag into macros, and tweaked the way normals are calculated.
2009-09-05 06:10:30 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
scol = MEM_callocN(sizeof(float) * me->totvert * 5, "scol");
part one of profiling/optimizing. made cddm not update tesselations itself in cddm_from_mesh. also made BMO_Test/Set/ClearFlag into macros, and tweaked the way normals are calculated.
2009-09-05 06:10:30 +00:00
fix shared vertex color (used with blur), to work with selection masking.
2012-04-30 21:46:58 +00:00
for (i = 0, mp = me->mpoly; i < me->totpoly; i++, mp++) {
if ((use_face_sel == FALSE) || (mp->flag & ME_FACE_SEL)) {
code cleanup: fix possible use of uninitialized value and remove dead initializations.
2012-05-23 21:39:39 +00:00
MLoop *ml = me->mloop + mp->loopstart;
MLoopCol *lcol = me->mloopcol + mp->loopstart;
fix shared vertex color (used with blur), to work with selection masking.
2012-04-30 21:46:58 +00:00
for (j = 0; j < mp->totloop; j++, ml++, lcol++) {
scol[ml->v][0] += lcol->r;
scol[ml->v][1] += lcol->g;
scol[ml->v][2] += lcol->b;
scol[ml->v][3] += 1.0f;
has_shared = 1;
}
part one of profiling/optimizing. made cddm not update tesselations itself in cddm_from_mesh. also made BMO_Test/Set/ClearFlag into macros, and tweaked the way normals are calculated.
2009-09-05 06:10:30 +00:00
}
}
fix shared vertex color (used with blur), to work with selection masking.
2012-04-30 21:46:58 +00:00
Fix for #29080: vertex paint mask doesn't work
2011-10-29 13:25:18 +00:00
if (has_shared) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = 0; i < me->totvert; i++) {
fix shared vertex color (used with blur), to work with selection masking.
2012-04-30 21:46:58 +00:00
if (scol[i][3] != 0.0f) {
mul_v3_fl(scol[i], 1.0f / scol[i][3]);
}
Fix for #29080: vertex paint mask doesn't work
2011-10-29 13:25:18 +00:00
}
fix shared vertex color (used with blur), to work with selection masking.
2012-04-30 21:46:58 +00:00
for (i = 0, mp = me->mpoly; i < me->totpoly; i++, mp++) {
if ((use_face_sel == FALSE) || (mp->flag & ME_FACE_SEL)) {
code cleanup: fix possible use of uninitialized value and remove dead initializations.
2012-05-23 21:39:39 +00:00
MLoop *ml = me->mloop + mp->loopstart;
MLoopCol *lcol = me->mloopcol + mp->loopstart;
fix shared vertex color (used with blur), to work with selection masking.
2012-04-30 21:46:58 +00:00
for (j = 0; j < mp->totloop; j++, ml++, lcol++) {
lcol->r = scol[ml->v][0];
lcol->g = scol[ml->v][1];
lcol->b = scol[ml->v][2];
}
}
Fix for #29080: vertex paint mask doesn't work
2011-10-29 13:25:18 +00:00
}
part one of profiling/optimizing. made cddm not update tesselations itself in cddm_from_mesh. also made BMO_Test/Set/ClearFlag into macros, and tweaked the way normals are calculated.
2009-09-05 06:10:30 +00:00
}
MEM_freeN(scol);
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
if (has_shared && do_tessface) {
Fix for #29080: vertex paint mask doesn't work
2011-10-29 13:25:18 +00:00
do_shared_vertex_tesscol(me);
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
static void make_vertexcol(Object *ob) /* single ob */
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
Mesh *me;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!ob || ob->id.lib) return;
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
me = BKE_mesh_from_object(ob);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (me == NULL) return;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (me->edit_btmesh) return;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
/* copies from shadedisplist to mcol */
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
if (!me->mloopcol) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!me->mcol) {
fix errors in bmesh vertex paint - was swapping matrix incorrectly, would fail when the object had any transform - wasn't calling mesh_update_customdata_pointers() when adding MCol's in some cases - was calling do_shared_vertexcol() twice when it didnt need to (blur painting only)
2012-01-18 08:43:27 +00:00
CustomData_add_layer(&me->fdata, CD_MCOL, CD_DEFAULT, NULL, me->totface);
}
if (!me->mloopcol) {
CustomData_add_layer(&me->ldata, CD_MLOOPCOL, CD_DEFAULT, NULL, me->totloop);
}
Quiet annoying warning: Warning! Tesselation uvs or vcol data got out of sync, "had to reset! This would happen on every editmode edit with UV's and wasn't too reassuring that blender was handling uvs/vcols correctly. From looking into the problem I found that creating the undo mesh would act as if it was tessellating the existing mesh each time and complain that the data was out of sync, when infact the mesh was just created and being filled in. Also, allocating uv and vcol customdata arrats for tessfaces isn't needed for undo mesh, so save some memory and dont allocate these in the first place.
2011-12-06 09:28:25 +00:00
mesh_update_customdata_pointers(me, TRUE);
manual sync with trunk - pulling in changes where the issues are not bmesh spesific - some merges added lines in multiple times - removed some NULL checks that were only in bmesh - enable cycles by default (was disabled because it used not to work) - make formatting match
2011-12-04 23:13:28 +00:00
}
some merge, vpaint and wpaint bugfixes
2009-09-01 16:05:33 +00:00
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
if (vertex_paint_use_tessface_check(ob)) {
/* assume if these exist, that they are up to date & valid */
if (!me->mcol || !me->mface) {
/* should always be true */
if (me->mcol) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
memset(me->mcol, 255, 4 * sizeof(MCol) * me->totface);
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
/* create tessfaces because they will be used for drawing & fast updates */
* remove the MFace parts of join (we only need polygon data) * other minor cleanups
2012-02-12 19:11:09 +00:00
BKE_mesh_tessface_calc(me); /* does own call to update pointers */
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
}
}
else {
if (me->totface) {
/* this wont be used, theres no need to keep it */
* remove the MFace parts of join (we only need polygon data) * other minor cleanups
2012-02-12 19:11:09 +00:00
BKE_mesh_tessface_clear(me);
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
}
}
style cleanup
2012-04-21 12:51:47 +00:00
//if (shade)
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
// shadeMeshMCol(scene, ob, me);
//else
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
DAG_id_tag_update was being called with non object ID's and OB_RECALC_* flags which only apply to objects. harmless but misleading.
2011-01-03 12:41:16 +00:00
DAG_id_tag_update(&me->id, 0);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
2011-05-31 03:48:27 +00:00
/* mirror_vgroup is set to -1 when invalid */
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
static int wpaint_mirror_vgroup_ensure(Object *ob, const int vgroup_active)
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
2011-05-31 03:48:27 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
bDeformGroup *defgroup = BLI_findlink(&ob->defbase, vgroup_active);
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
2011-05-31 03:48:27 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (defgroup) {
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
2011-05-31 03:48:27 +00:00
bDeformGroup *curdef;
int mirrdef;
char name[MAXBONENAME];
flip_side_name(name, defgroup->name, FALSE);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (strcmp(name, defgroup->name) != 0) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (curdef = ob->defbase.first, mirrdef = 0; curdef; curdef = curdef->next, mirrdef++) {
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
2011-05-31 03:48:27 +00:00
if (!strcmp(curdef->name, name)) {
break;
}
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (curdef == NULL) {
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
int olddef = ob->actdef; /* tsk, ED_vgroup_add sets the active defgroup */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
curdef = ED_vgroup_add_name(ob, name);
ob->actdef = olddef;
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
2011-05-31 03:48:27 +00:00
}
/* curdef should never be NULL unless this is
* a lamp and ED_vgroup_add_name fails */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (curdef) {
remove unused struct member & minor edits, no functional change.
2011-10-06 04:33:00 +00:00
return mirrdef;
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
2011-05-31 03:48:27 +00:00
}
}
}
remove unused struct member & minor edits, no functional change.
2011-10-06 04:33:00 +00:00
return -1;
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
2011-05-31 03:48:27 +00:00
}
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
static void copy_vpaint_prev(VPaint *vp, unsigned int *lcol, int tot)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (vp->vpaint_prev) {
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
MEM_freeN(vp->vpaint_prev);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vp->vpaint_prev = NULL;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vp->tot = tot;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (lcol == NULL || tot == 0) return;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vp->vpaint_prev = MEM_mallocN(sizeof(int) * tot, "vpaint_prev");
memcpy(vp->vpaint_prev, lcol, sizeof(int) * tot);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
static void copy_wpaint_prev(VPaint *wp, MDeformVert *dverts, int dcount)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
if (wp->wpaint_prev) {
free_dverts(wp->wpaint_prev, wp->tot);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
wp->wpaint_prev = NULL;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (dverts && dcount) {
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
wp->wpaint_prev = MEM_mallocN(sizeof(MDeformVert) * dcount, "wpaint prev");
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
wp->tot = dcount;
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
copy_dverts(wp->wpaint_prev, dverts, dcount);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
}
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
void vpaint_fill(Object *ob, unsigned int paintcol)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
Mesh *me;
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
MPoly *mp;
MLoopCol *lcol;
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
int i, j, selected;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
me = BKE_mesh_from_object(ob);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (me == NULL || me->totpoly == 0) return;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!me->mloopcol) make_vertexcol(ob);
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
if (!me->mloopcol) return; /* possible we can't make mcol's */
- possible fix for vertex paint 'fill' crash. - remove unneeded call to defvert_find_index() when weight painting.
2011-11-10 06:06:35 +00:00
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
selected = (me->editflag & ME_EDIT_PAINT_MASK);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
mp = me->mpoly;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = 0; i < me->totpoly; i++, mp++) {
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
if (!(!selected || mp->flag & ME_FACE_SEL))
continue;
lcol = me->mloopcol + mp->loopstart;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (j = 0; j < mp->totloop; j++, lcol++) {
*(int *)lcol = paintcol;
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
}
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
/* remove stale me->mcol, will be added later */
* remove the MFace parts of join (we only need polygon data) * other minor cleanups
2012-02-12 19:11:09 +00:00
BKE_mesh_tessface_clear(me);
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
DAG_id_tag_update was being called with non object ID's and OB_RECALC_* flags which only apply to objects. harmless but misleading.
2011-01-03 12:41:16 +00:00
DAG_id_tag_update(&me->id, 0);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
/* fills in the selected faces with the current weight and vertex group */
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
void wpaint_fill(VPaint *wp, Object *ob, float paintweight)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Mesh *me = ob->data;
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
2012-04-03 23:40:24 +00:00
MPoly *mp;
'uw' was used in weight paint code for previous deform weight, renamed to 'dw_prev'
2012-01-13 08:18:22 +00:00
MDeformWeight *dw, *dw_prev;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
int vgroup_active, vgroup_mirror = -1;
minor cleanup for weightpaint fill - SCE_SELECT_FACE and SCE_SELECT_VERTEX are mutually exclusive, use a macro to get a single value from them. - was allocating an array for no reason.
2011-11-02 00:51:21 +00:00
unsigned int index;
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
minor cleanup for weightpaint fill - SCE_SELECT_FACE and SCE_SELECT_VERTEX are mutually exclusive, use a macro to get a single value from them. - was allocating an array for no reason.
2011-11-02 00:51:21 +00:00
/* mutually exclusive, could be made into a */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
const short paint_selmode = ME_EDIT_PAINT_SEL_MODE(me);
Fix #20953: vertex and weight paint mode still had 500k verts limit.
2010-02-06 15:50:53 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (me->totpoly == 0 || me->dvert == NULL || !me->mpoly) return;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
vgroup_active = ob->actdef - 1;
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
2011-05-31 03:48:27 +00:00
remove unused struct member & minor edits, no functional change.
2011-10-06 04:33:00 +00:00
/* if mirror painting, find the other group */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (me->editflag & ME_EDIT_MIRROR_X) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vgroup_mirror = wpaint_mirror_vgroup_ensure(ob, vgroup_active);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
copy_wpaint_prev(wp, me->dvert, me->totvert);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
2012-04-03 23:40:24 +00:00
for (index = 0, mp = me->mpoly; index < me->totpoly; index++, mp++) {
unsigned int fidx = mp->totloop - 1;
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
2012-04-03 23:40:24 +00:00
if ((paint_selmode == SCE_SELECT_FACE) && !(mp->flag & ME_FACE_SEL)) {
minor cleanup for weightpaint fill - SCE_SELECT_FACE and SCE_SELECT_VERTEX are mutually exclusive, use a macro to get a single value from them. - was allocating an array for no reason.
2011-11-02 00:51:21 +00:00
continue;
}
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
minor cleanup for weightpaint fill - SCE_SELECT_FACE and SCE_SELECT_VERTEX are mutually exclusive, use a macro to get a single value from them. - was allocating an array for no reason.
2011-11-02 00:51:21 +00:00
do {
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
2012-04-03 23:40:24 +00:00
unsigned int vidx = me->mloop[mp->loopstart + fidx].v;
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!me->dvert[vidx].flag) {
if ((paint_selmode == SCE_SELECT_VERTEX) && !(me->mvert[vidx].flag & SELECT)) {
minor cleanup for weightpaint fill - SCE_SELECT_FACE and SCE_SELECT_VERTEX are mutually exclusive, use a macro to get a single value from them. - was allocating an array for no reason.
2011-11-02 00:51:21 +00:00
continue;
}
Started adding vertex masking--supports regular painting, and setting weight (Shift+K) Removed my unreferenced vars
2011-07-18 17:38:17 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dw = defvert_verify_index(&me->dvert[vidx], vgroup_active);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (dw) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dw_prev = defvert_verify_index(wp->wpaint_prev + vidx, vgroup_active);
dw_prev->weight = dw->weight; /* set the undo weight */
dw->weight = paintweight;
minor cleanup for weightpaint fill - SCE_SELECT_FACE and SCE_SELECT_VERTEX are mutually exclusive, use a macro to get a single value from them. - was allocating an array for no reason.
2011-11-02 00:51:21 +00:00
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
if (me->editflag & ME_EDIT_MIRROR_X) { /* x mirror painting */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
int j = mesh_get_x_mirror_vert(ob, vidx);
if (j >= 0) {
minor cleanup for weightpaint fill - SCE_SELECT_FACE and SCE_SELECT_VERTEX are mutually exclusive, use a macro to get a single value from them. - was allocating an array for no reason.
2011-11-02 00:51:21 +00:00
/* copy, not paint again */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (vgroup_mirror != -1) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dw = defvert_verify_index(me->dvert + j, vgroup_mirror);
dw_prev = defvert_verify_index(wp->wpaint_prev + j, vgroup_mirror);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
}
else {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dw = defvert_verify_index(me->dvert + j, vgroup_active);
dw_prev = defvert_verify_index(wp->wpaint_prev + j, vgroup_active);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dw_prev->weight = dw->weight; /* set the undo weight */
dw->weight = paintweight;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
}
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
me->dvert[vidx].flag = 1;
minor cleanup for weightpaint fill - SCE_SELECT_FACE and SCE_SELECT_VERTEX are mutually exclusive, use a macro to get a single value from them. - was allocating an array for no reason.
2011-11-02 00:51:21 +00:00
}
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
minor cleanup for weightpaint fill - SCE_SELECT_FACE and SCE_SELECT_VERTEX are mutually exclusive, use a macro to get a single value from them. - was allocating an array for no reason.
2011-11-02 00:51:21 +00:00
} while (fidx--);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
MDeformVert *dv = me->dvert;
for (index = me->totvert; index != 0; index--, dv++) {
dv->flag = 0;
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
minor cleanup for weightpaint fill - SCE_SELECT_FACE and SCE_SELECT_VERTEX are mutually exclusive, use a macro to get a single value from them. - was allocating an array for no reason.
2011-11-02 00:51:21 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
copy_wpaint_prev(wp, NULL, 0);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
DAG_id_tag_update was being called with non object ID's and OB_RECALC_* flags which only apply to objects. harmless but misleading.
2011-01-03 12:41:16 +00:00
DAG_id_tag_update(&me->id, 0);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
/* XXX: should be re-implemented as a vertex/weight paint 'color correct' operator */
#if 0
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
void vpaint_dogamma(Scene *scene)
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
VPaint *vp = scene->toolsettings->vpaint;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
Mesh *me;
Object *ob;
float igam, fac;
int a, temp;
* Added WM_operator_filesel which can be used for an operators invoke function (like WM_operator_confirm). It opens the files selector if "filename" property has not been set, else it executes the operator directly. Brecht, you might want to check, currently only sequencer add operators use it. * Added back Effects menu back, replaced SEQUENCER_OT_add_color_strip with SEQUENCER_OT_add_effect_strip. * Made sequencer header use operator UI functions. * gcc complains when char's are used as array indicies when they are not explicitly signed/unsigned, corrected previous change for vpaint to silence this error.
2009-01-26 09:13:15 +00:00
unsigned char *cp, gamtab[256];
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
ob = OBACT;
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
me = BKE_mesh_from_object(ob);
2.5/Vertex paint: * Made vertex paint local to object, like sculpt mode. * New test for vertex paint is (ob->mode & OB_MODE_VERTEX_PAINT)
2009-08-15 20:36:15 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!(ob->mode & OB_MODE_VERTEX_PAINT)) return;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (me == 0 || me->mcol == 0 || me->totface == 0) return;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
igam = 1.0 / vp->gamma;
for (a = 0; a < 256; a++) {
svn merge ^/trunk/blender -r42973:42991
2011-12-30 09:23:06 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
fac = ((float)a) / 255.0;
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
fac = vp->mul * pow(fac, igam);
svn merge ^/trunk/blender -r42973:42991
2011-12-30 09:23:06 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
temp = 255.9 * fac;
svn merge ^/trunk/blender -r42973:42991
2011-12-30 09:23:06 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (temp <= 0) gamtab[a] = 0;
else if (temp >= 255) gamtab[a] = 255;
else gamtab[a] = temp;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
a = 4 * me->totface;
cp = (unsigned char *)me->mcol;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
while (a--) {
svn merge ^/trunk/blender -r42973:42991
2011-12-30 09:23:06 +00:00
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
cp[1] = gamtab[cp[1]];
cp[2] = gamtab[cp[2]];
cp[3] = gamtab[cp[3]];
svn merge ^/trunk/blender -r42973:42991
2011-12-30 09:23:06 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
cp += 4;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
}
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
#endif
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE unsigned int mcol_blend(unsigned int col1, unsigned int col2, int fac)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned char *cp1, *cp2, *cp;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
int mfac;
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned int col = 0;
if (fac == 0) {
return col1;
}
if (fac >= 255) {
return col2;
}
mfac = 255 - fac;
cp1 = (unsigned char *)&col1;
cp2 = (unsigned char *)&col2;
cp = (unsigned char *)&col;
cp[0] = (mfac * cp1[0] + fac * cp2[0]) / 255;
cp[1] = (mfac * cp1[1] + fac * cp2[1]) / 255;
cp[2] = (mfac * cp1[2] + fac * cp2[2]) / 255;
cp[3] = 255;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
return col;
}
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE unsigned int mcol_add(unsigned int col1, unsigned int col2, int fac)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned char *cp1, *cp2, *cp;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
int temp;
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned int col = 0;
if (fac == 0) {
return col1;
}
cp1 = (unsigned char *)&col1;
cp2 = (unsigned char *)&col2;
cp = (unsigned char *)&col;
temp = cp1[0] + ((fac * cp2[0]) / 255);
cp[0] = (temp > 254) ? 255 : temp;
temp = cp1[1] + ((fac * cp2[1]) / 255);
cp[1] = (temp > 254) ? 255 : temp;
temp = cp1[2] + ((fac * cp2[2]) / 255);
cp[2] = (temp > 254) ? 255 : temp;
cp[3] = 255;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
return col;
}
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE unsigned int mcol_sub(unsigned int col1, unsigned int col2, int fac)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned char *cp1, *cp2, *cp;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
int temp;
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned int col = 0;
if (fac == 0) {
return col1;
}
cp1 = (unsigned char *)&col1;
cp2 = (unsigned char *)&col2;
cp = (unsigned char *)&col;
temp = cp1[0] - ((fac * cp2[0]) / 255);
cp1[0] = (temp < 0) ? 0 : temp;
temp = cp1[1] - ((fac * cp2[1]) / 255);
cp1[1] = (temp < 0) ? 0 : temp;
temp = cp1[2] - ((fac * cp2[2]) / 255);
cp1[2] = (temp < 0) ? 0 : temp;
cp[3] = 255;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
return col;
}
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE unsigned int mcol_mul(unsigned int col1, unsigned int col2, int fac)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned char *cp1, *cp2, *cp;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
int mfac;
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned int col = 0;
if (fac == 0) {
return col1;
}
mfac = 255 - fac;
cp1 = (unsigned char *)&col1;
cp2 = (unsigned char *)&col2;
cp = (unsigned char *)&col;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
/* first mul, then blend the fac */
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
cp[0] = (mfac * cp1[0] + fac * ((cp2[0] * cp1[0]) / 255)) / 255;
cp[1] = (mfac * cp1[1] + fac * ((cp2[1] * cp1[1]) / 255)) / 255;
cp[2] = (mfac * cp1[2] + fac * ((cp2[2] * cp1[2]) / 255)) / 255;
cp[3] = 255;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
return col;
}
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE unsigned int mcol_lighten(unsigned int col1, unsigned int col2, int fac)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned char *cp1, *cp2, *cp;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
int mfac;
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned int col = 0;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
if (fac == 0) {
return col1;
}
else if (fac >= 255) {
return col2;
}
mfac = 255 - fac;
cp1 = (unsigned char *)&col1;
cp2 = (unsigned char *)&col2;
cp = (unsigned char *)&col;
/* See if are lighter, if so mix, else don't do anything.
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* if the paint col is darker then the original, then ignore */
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
if (rgb_to_grayscale_byte(cp1) > rgb_to_grayscale_byte(cp2)) {
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
return col1;
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
}
cp[0] = (mfac * cp1[0] + fac * cp2[0]) / 255;
cp[1] = (mfac * cp1[1] + fac * cp2[1]) / 255;
cp[2] = (mfac * cp1[2] + fac * cp2[2]) / 255;
cp[3] = 255;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
return col;
}
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE unsigned int mcol_darken(unsigned int col1, unsigned int col2, int fac)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned char *cp1, *cp2, *cp;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
int mfac;
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
unsigned int col = 0;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
if (fac == 0) {
return col1;
}
else if (fac >= 255) {
return col2;
}
mfac = 255 - fac;
cp1 = (unsigned char *)&col1;
cp2 = (unsigned char *)&col2;
cp = (unsigned char *)&col;
/* See if were darker, if so mix, else don't do anything.
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* if the paint col is brighter then the original, then ignore */
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
if (rgb_to_grayscale_byte(cp1) < rgb_to_grayscale_byte(cp2)) {
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
return col1;
update vertex paint code for last commit, was still using ABGR order.
2012-03-17 21:11:28 +00:00
}
cp[0] = (mfac * cp1[0] + fac * cp2[0]) / 255;
cp[1] = (mfac * cp1[1] + fac * cp2[1]) / 255;
cp[2] = (mfac * cp1[2] + fac * cp2[2]) / 255;
cp[3] = 255;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
return col;
}
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
/* wpaint has 'wpaint_blend_tool' */
static unsigned int vpaint_blend_tool(const int tool, const unsigned int col,
vertex/weight paint - store brush_alpha() result so it doesnt need to be called for each vertex when paitning. - use _pressure suffix rather then _final to show the pressure has been applied. - weight paint was needlessly calculateing the test weight when multipaint was enabled.
2012-01-15 07:15:15 +00:00
const unsigned int paintcol, const int alpha_i)
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
{
switch (tool) {
case PAINT_BLEND_MIX:
fix for own error in recent paint refactor, subtract mode was broken.
2012-01-22 04:30:11 +00:00
case PAINT_BLEND_BLUR: return mcol_blend(col, paintcol, alpha_i);
case PAINT_BLEND_ADD: return mcol_add(col, paintcol, alpha_i);
case PAINT_BLEND_SUB: return mcol_sub(col, paintcol, alpha_i);
case PAINT_BLEND_MUL: return mcol_mul(col, paintcol, alpha_i);
case PAINT_BLEND_LIGHTEN: return mcol_lighten(col, paintcol, alpha_i);
case PAINT_BLEND_DARKEN: return mcol_darken(col, paintcol, alpha_i);
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
default:
BLI_assert(0);
return 0;
}
}
/* wpaint has 'wpaint_blend' */
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
static unsigned int vpaint_blend(VPaint *vp, unsigned int col, unsigned int colorig, const
unsigned int paintcol, const int alpha_i,
/* pre scaled from [0-1] --> [0-255] */
const int brush_alpha_value_i)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
Brush *brush = paint_brush(&vp->paint);
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
const int tool = brush->vertexpaint_tool;
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
col = vpaint_blend_tool(tool, col, paintcol, alpha_i);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
/* if no spray, clip color adding with colorig & orig alpha */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if ((vp->flag & VP_SPRAY) == 0) {
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
unsigned int testcol, a;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
char *cp, *ct, *co;
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
testcol = vpaint_blend_tool(tool, colorig, paintcol, brush_alpha_value_i);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
cp = (char *)&col;
ct = (char *)&testcol;
co = (char *)&colorig;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (a = 0; a < 4; a++) {
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
if (ct[a] < co[a]) {
if (cp[a] < ct[a]) cp[a] = ct[a];
else if (cp[a] > co[a]) cp[a] = co[a];
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
else {
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
if (cp[a] < co[a]) cp[a] = co[a];
else if (cp[a] > ct[a]) cp[a] = ct[a];
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
}
}
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
return col;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
static int sample_backbuf_area(ViewContext *vc, int *indexar, int totface, int x, int y, float size)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
struct ImBuf *ibuf;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
int a, tot = 0, index;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup - comment spelling + translate some dutch.
2012-03-04 04:35:12 +00:00
/* brecht: disabled this because it obviously fails for
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* brushes with size > 64, why is this here? */
style cleanup
2012-04-21 12:51:47 +00:00
/*if (size > 64.0) size = 64.0;*/
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
ibuf = view3d_read_backbuf(vc, x - size, y - size, x + size, y + size);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ibuf) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
unsigned int *rt = ibuf->rect;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
memset(indexar, 0, sizeof(int) * (totface + 1));
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
size = ibuf->x * ibuf->y;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
while (size--) {
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (*rt) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
index = WM_framebuffer_to_index(*rt);
if (index > 0 && index <= totface)
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
indexar[index] = 1;
}
rt++;
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (a = 1; a <= totface; a++) {
if (indexar[a]) indexar[tot++] = a;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
IMB_freeImBuf(ibuf);
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
return tot;
}
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.
2011-12-30 05:16:28 +00:00
/* whats _dl mean? */
code cleanup: minor improvements to float/vector usage.
2012-05-12 22:13:38 +00:00
static float calc_vp_strength_dl(VPaint *vp, ViewContext *vc, const float vert_nor[3],
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
const float mval[2], const float brush_size_pressure)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
Brush *brush = paint_brush(&vp->paint);
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
float dist_squared;
float vertco[2], delta[2];
== 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
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
project_float_noclip(vc->ar, vert_nor, vertco);
sub_v2_v2v2(delta, mval, vertco);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dist_squared = dot_v2v2(delta, delta); /* len squared */
vertex/weight paint - store brush_alpha() result so it doesnt need to be called for each vertex when paitning. - use _pressure suffix rather then _final to show the pressure has been applied. - weight paint was needlessly calculateing the test weight when multipaint was enabled.
2012-01-15 07:15:15 +00:00
if (dist_squared > brush_size_pressure * brush_size_pressure) {
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
return 0.0f;
}
else {
const float dist = sqrtf(dist_squared);
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
return BKE_brush_curve_strength_clamp(brush, dist, brush_size_pressure);
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
}
}
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.
2011-12-30 05:16:28 +00:00
static float calc_vp_alpha_dl(VPaint *vp, ViewContext *vc,
float vpimat[][3], const float *vert_nor,
const float mval[2],
vertex/weight paint - store brush_alpha() result so it doesnt need to be called for each vertex when paitning. - use _pressure suffix rather then _final to show the pressure has been applied. - weight paint was needlessly calculateing the test weight when multipaint was enabled.
2012-01-15 07:15:15 +00:00
const float brush_size_pressure, const float brush_alpha_pressure)
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.
2011-12-30 05:16:28 +00:00
{
vertex/weight paint - store brush_alpha() result so it doesnt need to be called for each vertex when paitning. - use _pressure suffix rather then _final to show the pressure has been applied. - weight paint was needlessly calculateing the test weight when multipaint was enabled.
2012-01-15 07:15:15 +00:00
float strength = calc_vp_strength_dl(vp, vc, vert_nor, mval, brush_size_pressure);
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.
2011-12-30 05:16:28 +00:00
if (strength > 0.0f) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
float alpha = brush_alpha_pressure * strength;
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (vp->flag & VP_NORMALS) {
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.
2011-12-30 05:16:28 +00:00
float dvec[3];
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
const float *no = vert_nor + 3;
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
/* transpose ! */
dvec[2] = dot_v3v3(vpimat[2], no);
if (dvec[2] > 0.0f) {
dvec[0] = dot_v3v3(vpimat[0], no);
dvec[1] = dot_v3v3(vpimat[1], no);
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.
2011-12-30 05:16:28 +00:00
alpha *= dvec[2] / len_v3(dvec);
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
}
else {
return 0.0f;
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
return alpha;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.
2011-12-30 05:16:28 +00:00
return 0.0f;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
fix for own error in recent paint refactor, subtract mode was broken.
2012-01-22 04:30:11 +00:00
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE float wval_blend(const float weight, const float paintval, const float alpha)
fix for own error in recent paint refactor, subtract mode was broken.
2012-01-22 04:30:11 +00:00
{
return (paintval * alpha) + (weight * (1.0f - alpha));
}
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE float wval_add(const float weight, const float paintval, const float alpha)
fix for own error in recent paint refactor, subtract mode was broken.
2012-01-22 04:30:11 +00:00
{
return weight + (paintval * alpha);
}
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE float wval_sub(const float weight, const float paintval, const float alpha)
fix for own error in recent paint refactor, subtract mode was broken.
2012-01-22 04:30:11 +00:00
{
return weight - (paintval * alpha);
}
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE float wval_mul(const float weight, const float paintval, const float alpha)
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
{ /* first mul, then blend the fac */
fix for own error in recent paint refactor, subtract mode was broken.
2012-01-22 04:30:11 +00:00
return ((1.0f - alpha) + (alpha * paintval)) * weight;
}
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE float wval_lighten(const float weight, const float paintval, const float alpha)
fix for own error in recent paint refactor, subtract mode was broken.
2012-01-22 04:30:11 +00:00
{
return (weight < paintval) ? wval_blend(weight, paintval, alpha) : weight;
}
rename define BM_INLINE -> BLI_INLINE to avoid confusion with bmesh defines.
2012-03-20 08:42:26 +00:00
BLI_INLINE float wval_darken(const float weight, const float paintval, const float alpha)
fix for own error in recent paint refactor, subtract mode was broken.
2012-01-22 04:30:11 +00:00
{
return (weight > paintval) ? wval_blend(weight, paintval, alpha) : weight;
}
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
/* vpaint has 'vpaint_blend_tool' */
vertex/weight paint - store brush_alpha() result so it doesnt need to be called for each vertex when paitning. - use _pressure suffix rather then _final to show the pressure has been applied. - weight paint was needlessly calculateing the test weight when multipaint was enabled.
2012-01-15 07:15:15 +00:00
/* result is not clamped from [0-1] */
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
static float wpaint_blend_tool(const int tool,
/* dw->weight */
const float weight,
const float paintval, const float alpha)
{
switch (tool) {
case PAINT_BLEND_MIX:
fix for own error in recent paint refactor, subtract mode was broken.
2012-01-22 04:30:11 +00:00
case PAINT_BLEND_BLUR: return wval_blend(weight, paintval, alpha);
case PAINT_BLEND_ADD: return wval_add(weight, paintval, alpha);
case PAINT_BLEND_SUB: return wval_sub(weight, paintval, alpha);
case PAINT_BLEND_MUL: return wval_mul(weight, paintval, alpha);
case PAINT_BLEND_LIGHTEN: return wval_lighten(weight, paintval, alpha);
case PAINT_BLEND_DARKEN: return wval_darken(weight, paintval, alpha);
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
default:
BLI_assert(0);
return 0.0f;
}
}
/* vpaint has 'vpaint_blend' */
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
static float wpaint_blend(VPaint *wp, float weight, float weight_prev,
const float alpha, float paintval,
const float brush_alpha_value,
const short do_flip, const short do_multipaint_totsel)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
Brush *brush = paint_brush(&wp->paint);
Moved the image paint tool and the vertex/weight paint tool (blend mode?) to the Brush data. This now works the same way as sculpt, with named preset brushes that retain settings.
2010-01-20 08:30:40 +00:00
int tool = brush->vertexpaint_tool;
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.
2011-12-30 05:16:28 +00:00
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
if (do_flip) {
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
switch (tool) {
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
case PAINT_BLEND_MIX:
* Removed tablet pressure sensitive number field widget scrubbing, wasn't that useful and I suspect it was the cause of a few bugs * Added tablet pressure support (size/strength) for weight paint and vertex paint * Added tablet eraser support for weight paint and vertex paint (inverts the effect of the current tool) * Removed the old 'soft' option, now weight paint and vertex paint use the influence curve * Made the default brush use a smooth influence curve, rather than sharp
2009-11-20 01:39:27 +00:00
paintval = 1.f - paintval; break;
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
case PAINT_BLEND_ADD:
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
tool = PAINT_BLEND_SUB; break;
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
case PAINT_BLEND_SUB:
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
tool = PAINT_BLEND_ADD; break;
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
case PAINT_BLEND_LIGHTEN:
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
tool = PAINT_BLEND_DARKEN; break;
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
case PAINT_BLEND_DARKEN:
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
tool = PAINT_BLEND_LIGHTEN; break;
* Removed tablet pressure sensitive number field widget scrubbing, wasn't that useful and I suspect it was the cause of a few bugs * Added tablet pressure support (size/strength) for weight paint and vertex paint * Added tablet eraser support for weight paint and vertex paint (inverts the effect of the current tool) * Removed the old 'soft' option, now weight paint and vertex paint use the influence curve * Made the default brush use a smooth influence curve, rather than sharp
2009-11-20 01:39:27 +00:00
}
}
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
weight = wpaint_blend_tool(tool, weight, paintval, alpha);
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
/* delay clamping until the end so multi-paint can function when the active group is at the limits */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (do_multipaint_totsel == FALSE) {
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
CLAMP(weight, 0.0f, 1.0f);
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
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
/* if no spray, clip result with orig weight & orig alpha */
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
if ((wp->flag & VP_SPRAY) == 0) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (do_multipaint_totsel == FALSE) {
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
float testw = wpaint_blend_tool(tool, weight_prev, paintval, brush_alpha_value);
vertex/weight paint - store brush_alpha() result so it doesnt need to be called for each vertex when paitning. - use _pressure suffix rather then _final to show the pressure has been applied. - weight paint was needlessly calculateing the test weight when multipaint was enabled.
2012-01-15 07:15:15 +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
CLAMP(testw, 0.0f, 1.0f);
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
if (testw < weight_prev) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (weight < testw) weight = testw;
else if (weight > weight_prev) weight = weight_prev;
Made multi-paint change the weight values based on the artist's suggestion. + fixed a huge problem with reseting the weights while using multi-paint.
2011-06-29 18:20:39 +00:00
}
else {
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
if (weight > testw) weight = testw;
else if (weight < weight_prev) weight = weight_prev;
Made multi-paint change the weight values based on the artist's suggestion. + fixed a huge problem with reseting the weights while using multi-paint.
2011-06-29 18:20:39 +00:00
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
}
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
return weight;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
/* ----------------------------------------------------- */
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
/* sets wp->weight to the closest weight value to vertex */
/* note: we cant sample frontbuf, weight colors are interpolated too unpredictable */
static int weight_sample_invoke(bContext *C, wmOperator *op, wmEvent *event)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
ViewContext vc;
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
Mesh *me;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
short change = FALSE;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
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
view3d_set_viewcontext(C, &vc);
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
me = BKE_mesh_from_object(vc.obact);
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
if (me && me->dvert && vc.v3d && vc.rv3d) {
int index;
view3d_operator_needs_opengl(C);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
index = view3d_sample_backbuf(&vc, event->mval[0], event->mval[1]);
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
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (index && index <= me->totpoly) {
DerivedMesh *dm = mesh_get_derived_final(vc.scene, vc.obact, CD_MASK_BAREMESH);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (dm->getVertCo == NULL) {
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
BKE_report(op->reports, RPT_WARNING, "The modifier used does not support deformed locations");
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
else {
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
2012-04-03 23:40:24 +00:00
MPoly *mp = ((MPoly *)me->mpoly) + (index - 1);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
const int vgroup_active = vc.obact->actdef - 1;
Fix wrong unified weight paint value version patch, was doing incorrect version check. Fix #31209: weight paint sample & fill not using correct brush/unified value.
2012-05-02 16:05:25 +00:00
Scene *scene = vc.scene;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
ToolSettings *ts = vc.scene->toolsettings;
Fix wrong unified weight paint value version patch, was doing incorrect version check. Fix #31209: weight paint sample & fill not using correct brush/unified value.
2012-05-02 16:05:25 +00:00
Brush *brush = paint_brush(&ts->wpaint->paint);
code cleanup
2012-09-06 23:41:03 +00:00
const float mval_f[2] = {(float)event->mval[0],
(float)event->mval[1]};
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
int v_idx_best = -1;
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
int fidx;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
float len_best = FLT_MAX;
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
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
2012-04-03 23:40:24 +00:00
fidx = mp->totloop - 1;
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
do {
float co[3], sco[3], len;
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
2012-04-03 23:40:24 +00:00
const int v_idx = me->mloop[mp->loopstart + fidx].v;
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
dm->getVertCo(dm, v_idx, co);
project_float_noclip(vc.ar, co, sco);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
len = len_squared_v2v2(mval_f, sco);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (len < len_best) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
len_best = len;
v_idx_best = v_idx;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
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
} while (fidx--);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (v_idx_best != -1) { /* should always be valid */
Fix wrong unified weight paint value version patch, was doing incorrect version check. Fix #31209: weight paint sample & fill not using correct brush/unified value.
2012-05-02 16:05:25 +00:00
float vgroup_weight = defvert_find_weight(&me->dvert[v_idx_best], vgroup_active);
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
BKE_brush_weight_set(scene, brush, vgroup_weight);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
change = TRUE;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
}
dm->release(dm);
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
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
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
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (change) {
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
/* not really correct since the brush didnt change, but redraws the toolbar */
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
WM_main_add_notifier(NC_BRUSH | NA_EDITED, NULL); /* ts->wpaint->paint.brush */
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
return OPERATOR_FINISHED;
}
else {
return OPERATOR_CANCELLED;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
}
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
void PAINT_OT_weight_sample(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Weight Paint Sample Weight";
ot->idname = "PAINT_OT_weight_sample";
Second part of fix for [#31157]: Some (actually, 172) operators have no tooltip. About 30 undocumented ops remaining...
2012-05-05 17:10:51 +00:00
ot->description = "Use the mouse to sample a weight in the 3D view";
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
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->invoke = weight_sample_invoke;
ot->poll = weight_paint_mode_poll;
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
/* flags */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->flag = OPTYPE_UNDO;
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
}
/* samples cursor location, and gives menu with vertex groups to activate */
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
2011-05-31 03:48:27 +00:00
static EnumPropertyItem *weight_paint_sample_enum_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), int *free)
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
{
if (C) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
wmWindow *win = CTX_wm_window(C);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (win && win->eventstate) {
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
ViewContext vc;
Mesh *me;
view3d_set_viewcontext(C, &vc);
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
me = BKE_mesh_from_object(vc.obact);
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
if (me && me->dvert && vc.v3d && vc.rv3d) {
int index;
code cleanup
2012-09-06 23:41:03 +00:00
int mval[2] = {win->eventstate->x - vc.ar->winrct.xmin,
win->eventstate->y - vc.ar->winrct.ymin};
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
view3d_operator_needs_opengl(C);
code cleanup
2012-09-06 23:41:03 +00:00
index = view3d_sample_backbuf(&vc, mval[0], mval[1]);
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
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (index && index <= me->totpoly) {
const int defbase_tot = BLI_countlist(&vc.obact->defbase);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (defbase_tot) {
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
2012-04-03 23:40:24 +00:00
MPoly *mp = ((MPoly *)me->mpoly) + (index - 1);
unsigned int fidx = mp->totloop - 1;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
int *groups = MEM_callocN(defbase_tot * sizeof(int), "groups");
int found = FALSE;
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
do {
rename MPoly vars called mface or mf, to avoid confusion with MFace types.
2012-04-03 23:40:24 +00:00
MDeformVert *dvert = me->dvert + me->mloop[mp->loopstart + fidx].v;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
int i = dvert->totweight;
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
MDeformWeight *dw;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (dw = dvert->dw; i > 0; dw++, i--) {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
if (dw->def_nr < defbase_tot) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
groups[dw->def_nr] = TRUE;
found = TRUE;
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
}
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
}
} while (fidx--);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (found == FALSE) {
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
MEM_freeN(groups);
}
else {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
EnumPropertyItem *item = NULL, item_tmp = {0};
int totitem = 0;
int i = 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
bDeformGroup *dg;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (dg = vc.obact->defbase.first; dg && i < defbase_tot; i++, dg = dg->next) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (groups[i]) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
item_tmp.identifier = item_tmp.name = dg->name;
item_tmp.value = i;
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
RNA_enum_item_add(&item, &totitem, &item_tmp);
}
}
RNA_enum_item_end(&item, &totitem);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
*free = 1;
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
MEM_freeN(groups);
return item;
}
}
}
}
}
}
return DummyRNA_NULL_items;
}
static int weight_sample_group_exec(bContext *C, wmOperator *op)
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
int type = RNA_enum_get(op->ptr, "group");
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
ViewContext vc;
view3d_set_viewcontext(C, &vc);
Code cleanup: fix a few warnings (>= 0 and == -1 tests on unsigned types).
2011-12-17 01:13:02 +00:00
BLI_assert(type + 1 >= 0);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vc.obact->actdef = type + 1;
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
DAG_id_tag_update(&vc.obact->id, OB_RECALC_DATA);
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, vc.obact);
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
return OPERATOR_FINISHED;
}
svn merge -r36890:36900 https://svn.blender.org/svnroot/bf-blender/trunk/blender, commented out vertex group sample functions, these still need porting.
2011-05-31 03:48:27 +00:00
/* TODO, we could make this a menu into OBJECT_OT_vertex_group_set_active rather than its own operator */
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
void PAINT_OT_weight_sample_group(wmOperatorType *ot)
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
PropertyRNA *prop = NULL;
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
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Weight Paint Sample Group";
ot->idname = "PAINT_OT_weight_sample_group";
Second part of fix for [#31157]: Some (actually, 172) operators have no tooltip. About 30 undocumented ops remaining...
2012-05-05 17:10:51 +00:00
ot->description = "Select one of the vertex groups available under current mouse position";
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
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = weight_sample_group_exec;
ot->invoke = WM_menu_invoke;
ot->poll = weight_paint_mode_poll;
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
/* flags */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->flag = OPTYPE_UNDO;
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
/* keyingset to use (dynamic enum) */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
prop = RNA_def_enum(ot->srna, "group", DummyRNA_DEFAULT_items, 0, "Keying Set", "The Keying Set to use");
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
RNA_def_enum_funcs(prop, weight_paint_sample_enum_itemf);
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->prop = prop;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
another minor weightpaint change, dont pass do_auto_normalize as a bool arg to do_weight_paint_normalize_all(), just check before calling.
2012-01-13 02:25:15 +00:00
static void do_weight_paint_normalize_all(MDeformVert *dvert, const int defbase_tot, const char *vgroup_validmap)
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
float sum = 0.0f, fac;
unsigned int i, tot = 0;
another minor weightpaint change, dont pass do_auto_normalize as a bool arg to do_weight_paint_normalize_all(), just check before calling.
2012-01-13 02:25:15 +00:00
MDeformWeight *dw;
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
if (dw->def_nr < defbase_tot && vgroup_validmap[dw->def_nr]) {
tot++;
sum += dw->weight;
}
}
if ((tot == 0) || (sum == 1.0f)) {
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
return;
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
}
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
if (sum != 0.0f) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
fac = 1.0f / sum;
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
if (dw->def_nr < defbase_tot && vgroup_validmap[dw->def_nr]) {
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
dw->weight *= fac;
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
}
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
}
}
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
else {
/* hrmf, not a factor in this case */
fac = 1.0f / tot;
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
if (dw->def_nr < defbase_tot && vgroup_validmap[dw->def_nr]) {
dw->weight = fac;
}
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
}
}
}
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
/* same as function above except it normalizes against the active vgroup which remains unchanged
*
* note that the active is just the group which is unchanged, it can be any,
* can also be -1 to normalize all but in that case call 'do_weight_paint_normalize_all' */
static void do_weight_paint_normalize_all_active(MDeformVert *dvert, const int defbase_tot, const char *vgroup_validmap,
const int vgroup_active)
editarmature.c and paint_vertex.c I added the first version of multi-bone selection for faster, temporary locking/unlocking; right now, if multiple bones are selected, the selection is considered unlocked, despite any vgroup checkbox status. Every other group is considered locked. paint_vertex.c A modified Auto Normalize was inserted to normalize the active group normally instead of locking the values: it was causing the active group to steal weights from locked groups if the active group had a weight of 1.0, and that destroyed the locked groups deformations.
2011-06-07 17:59:38 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
float sum = 0.0f, fac;
unsigned int i, tot = 0;
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
MDeformWeight *dw;
float act_weight = 0.0f;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
if (dw->def_nr < defbase_tot && vgroup_validmap[dw->def_nr]) {
if (dw->def_nr != vgroup_active) {
another minor weightpaint change, dont pass do_auto_normalize as a bool arg to do_weight_paint_normalize_all(), just check before calling.
2012-01-13 02:25:15 +00:00
sum += dw->weight;
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
tot++;
}
else {
act_weight = dw->weight;
another minor weightpaint change, dont pass do_auto_normalize as a bool arg to do_weight_paint_normalize_all(), just check before calling.
2012-01-13 02:25:15 +00:00
}
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
}
}
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
if ((tot == 0) || (sum + act_weight == 1.0f)) {
editarmature.c and paint_vertex.c I added the first version of multi-bone selection for faster, temporary locking/unlocking; right now, if multiple bones are selected, the selection is considered unlocked, despite any vgroup checkbox status. Every other group is considered locked. paint_vertex.c A modified Auto Normalize was inserted to normalize the active group normally instead of locking the values: it was causing the active group to steal weights from locked groups if the active group had a weight of 1.0, and that destroyed the locked groups deformations.
2011-06-07 17:59:38 +00:00
return;
fix for crash when painting normalize with no vertex groups, also minor cleanup to do_weight_paint_auto_normalize_all_groups()
2011-10-06 01:29:32 +00:00
}
editarmature.c and paint_vertex.c I added the first version of multi-bone selection for faster, temporary locking/unlocking; right now, if multiple bones are selected, the selection is considered unlocked, despite any vgroup checkbox status. Every other group is considered locked. paint_vertex.c A modified Auto Normalize was inserted to normalize the active group normally instead of locking the values: it was causing the active group to steal weights from locked groups if the active group had a weight of 1.0, and that destroyed the locked groups deformations.
2011-06-07 17:59:38 +00:00
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
if (sum != 0.0f) {
fac = (1.0f / sum) * (1.0f - act_weight);
fix for crash when painting normalize with no vertex groups, also minor cleanup to do_weight_paint_auto_normalize_all_groups()
2011-10-06 01:29:32 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
if (dw->def_nr < defbase_tot && vgroup_validmap[dw->def_nr]) {
if (dw->def_nr != vgroup_active) {
dw->weight *= fac;
/* paranoid but possibly with float error */
CLAMP(dw->weight, 0.0f, 1.0f);
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
}
fix for crash when painting normalize with no vertex groups, also minor cleanup to do_weight_paint_auto_normalize_all_groups()
2011-10-06 01:29:32 +00:00
}
}
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
}
else {
/* corner case where we need to scale all weights evenly because they're all zero */
editarmature.c and paint_vertex.c I added the first version of multi-bone selection for faster, temporary locking/unlocking; right now, if multiple bones are selected, the selection is considered unlocked, despite any vgroup checkbox status. Every other group is considered locked. paint_vertex.c A modified Auto Normalize was inserted to normalize the active group normally instead of locking the values: it was causing the active group to steal weights from locked groups if the active group had a weight of 1.0, and that destroyed the locked groups deformations.
2011-06-07 17:59:38 +00:00
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
/* hrmf, not a factor in this case */
fac = (1.0f - act_weight) / tot;
editarmature.c and paint_vertex.c I added the first version of multi-bone selection for faster, temporary locking/unlocking; right now, if multiple bones are selected, the selection is considered unlocked, despite any vgroup checkbox status. Every other group is considered locked. paint_vertex.c A modified Auto Normalize was inserted to normalize the active group normally instead of locking the values: it was causing the active group to steal weights from locked groups if the active group had a weight of 1.0, and that destroyed the locked groups deformations.
2011-06-07 17:59:38 +00:00
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
/* paranoid but possibly with float error */
CLAMP(fac, 0.0f, 1.0f);
editarmature.c and paint_vertex.c I added the first version of multi-bone selection for faster, temporary locking/unlocking; right now, if multiple bones are selected, the selection is considered unlocked, despite any vgroup checkbox status. Every other group is considered locked. paint_vertex.c A modified Auto Normalize was inserted to normalize the active group normally instead of locking the values: it was causing the active group to steal weights from locked groups if the active group had a weight of 1.0, and that destroyed the locked groups deformations.
2011-06-07 17:59:38 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
if (dw->def_nr < defbase_tot && vgroup_validmap[dw->def_nr]) {
if (dw->def_nr != vgroup_active) {
dw->weight = fac;
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
}
fix for crash when painting normalize with no vertex groups, also minor cleanup to do_weight_paint_auto_normalize_all_groups()
2011-10-06 01:29:32 +00:00
}
editarmature.c and paint_vertex.c I added the first version of multi-bone selection for faster, temporary locking/unlocking; right now, if multiple bones are selected, the selection is considered unlocked, despite any vgroup checkbox status. Every other group is considered locked. paint_vertex.c A modified Auto Normalize was inserted to normalize the active group normally instead of locking the values: it was causing the active group to steal weights from locked groups if the active group had a weight of 1.0, and that destroyed the locked groups deformations.
2011-06-07 17:59:38 +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
Remembered to free memory in gen_lck_flags() when it returned NULL when there were no locks present. Changed the lock system to redistribute changes of unlocked groups to other unlocked groups instead of just maintaining ratios within locked groups.
2011-06-01 15:45:09 +00:00
/*
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* See if the current deform vertex has a locked group
*/
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
static char has_locked_group(MDeformVert *dvert, const int defbase_tot,
patch from Jason Hays --- Locking only redistributes or restricts weights when using bone groups. So, in addition to adding a NULL check to my last bit of code, I made has_locked_group() check for bone groups.
2011-12-30 11:31:48 +00:00
const char *bone_groups, const char *lock_flags)
Remembered to free memory in gen_lck_flags() when it returned NULL when there were no locks present. Changed the lock system to redistribute changes of unlocked groups to other unlocked groups instead of just maintaining ratios within locked groups.
2011-06-01 15:45:09 +00:00
{
int i;
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
MDeformWeight *dw;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
if (dw->def_nr < defbase_tot) {
patch from Jason Hays --- Locking only redistributes or restricts weights when using bone groups. So, in addition to adding a NULL check to my last bit of code, I made has_locked_group() check for bone groups.
2011-12-30 11:31:48 +00:00
if (bone_groups[dw->def_nr] && lock_flags[dw->def_nr] && dw->weight > 0.0f) {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
return TRUE;
}
Remembered to free memory in gen_lck_flags() when it returned NULL when there were no locks present. Changed the lock system to redistribute changes of unlocked groups to other unlocked groups instead of just maintaining ratios within locked groups.
2011-06-01 15:45:09 +00:00
}
}
return FALSE;
}
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
minor changes, fix coming next (no functional edits).
2011-12-09 06:05:58 +00:00
static int has_locked_group_selected(int defbase_tot, const char *defbase_sel, const char *lock_flags)
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
{
Made Multi-Paint support vertices containing locked groups Changed locking system to check the amount of space in unlocked groups ahead of time.
2011-06-14 19:11:01 +00:00
int i;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (i = 0; i < defbase_tot; i++) {
if (defbase_sel[i] && lock_flags[i]) {
Made Multi-Paint support vertices containing locked groups Changed locking system to check the amount of space in unlocked groups ahead of time.
2011-06-14 19:11:01 +00:00
return TRUE;
}
}
return FALSE;
}
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +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
another cleanup pass, quiet all warnings for GCC - comment unused funcs/vars. - replace some allocs with stack variables. - use BLI_math functions to replace in-line vector math.
2011-09-14 05:25:43 +00:00
#if 0 /* UNUSED */
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
static int has_unselected_unlocked_bone_group(int defbase_tot, char *defbase_sel, int selected, char *lock_flags, char *vgroup_validmap)
{
Made Multi-Paint support vertices containing locked groups Changed locking system to check the amount of space in unlocked groups ahead of time.
2011-06-14 19:11:01 +00:00
int i;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (defbase_tot == selected) {
Made Multi-Paint support vertices containing locked groups Changed locking system to check the amount of space in unlocked groups ahead of time.
2011-06-14 19:11:01 +00:00
return FALSE;
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (i = 0; i < defbase_tot; i++) {
if (vgroup_validmap[i] && !defbase_sel[i] && !lock_flags[i]) {
Made Multi-Paint support vertices containing locked groups Changed locking system to check the amount of space in unlocked groups ahead of time.
2011-06-14 19:11:01 +00:00
return TRUE;
}
}
return FALSE;
}
another cleanup pass, quiet all warnings for GCC - comment unused funcs/vars. - replace some allocs with stack variables. - use BLI_math functions to replace in-line vector math.
2011-09-14 05:25:43 +00:00
#endif
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +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
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
static void multipaint_selection(MDeformVert *dvert, const int defbase_tot, float change, const char *defbase_sel)
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
{
Remembered to free memory in gen_lck_flags() when it returned NULL when there were no locks present. Changed the lock system to redistribute changes of unlocked groups to other unlocked groups instead of just maintaining ratios within locked groups.
2011-06-01 15:45:09 +00:00
int i;
MDeformWeight *dw;
Tweaked multi-paint and the way the colors are displayed so one of the artists could see it- when you paint the active group, and makes the others match based on the change factor; so the active group being 0 is not handled.
2011-06-21 19:20:42 +00:00
float val;
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* make sure they are all at most 1 after the change */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (i = 0; i < defbase_tot; i++) {
if (defbase_sel[i]) {
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
dw = defvert_find_index(dvert, i);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (dw && dw->weight) {
Tweaked multi-paint and the way the colors are displayed so one of the artists could see it- when you paint the active group, and makes the others match based on the change factor; so the active group being 0 is not handled.
2011-06-21 19:20:42 +00:00
val = dw->weight * change;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (val > 1) {
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* TODO: when the change is reduced, you need to recheck
* the earlier values to make sure they are not 0
* (precision error) */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
change = 1.0f / dw->weight;
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
}
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* the value should never reach zero while multi-painting if it
* was nonzero beforehand */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (val <= 0) {
Made multi-paint change the weight values based on the artist's suggestion. + fixed a huge problem with reseting the weights while using multi-paint.
2011-06-29 18:20:39 +00:00
return;
}
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
}
Remembered to free memory in gen_lck_flags() when it returned NULL when there were no locks present. Changed the lock system to redistribute changes of unlocked groups to other unlocked groups instead of just maintaining ratios within locked groups.
2011-06-01 15:45:09 +00:00
}
}
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* apply the valid change */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (i = 0; i < defbase_tot; i++) {
if (defbase_sel[i]) {
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
dw = defvert_find_index(dvert, i);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (dw && dw->weight) {
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
dw->weight = dw->weight * change;
}
editarmature.c and paint_vertex.c I added the first version of multi-bone selection for faster, temporary locking/unlocking; right now, if multiple bones are selected, the selection is considered unlocked, despite any vgroup checkbox status. Every other group is considered locked. paint_vertex.c A modified Auto Normalize was inserted to normalize the active group normally instead of locking the values: it was causing the active group to steal weights from locked groups if the active group had a weight of 1.0, and that destroyed the locked groups deformations.
2011-06-07 17:59:38 +00:00
}
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +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
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* move all change onto valid, unchanged groups. If there is change left over,
* then return it.
* assumes there are valid groups to shift weight onto */
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
static float redistribute_change(MDeformVert *ndv, const int defbase_tot,
char *change_status, const char change_me, int changeto,
float totchange, float total_valid,
char do_auto_normalize)
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
{
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
float was_change;
float change;
float oldval;
MDeformWeight *ndw;
int i;
do {
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* assume there is no change until you see one */
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
was_change = FALSE;
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* change each group by the same amount each time */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
change = totchange / total_valid;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (i = 0; i < ndv->totweight && total_valid && totchange; i++) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
ndw = (ndv->dw + i);
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
/* ignore anything outside the value range */
if (ndw->def_nr < defbase_tot) {
/* change only the groups with a valid status */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (change_status[ndw->def_nr] == change_me) {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
oldval = ndw->weight;
/* if auto normalize is active, don't worry about upper bounds */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (do_auto_normalize == FALSE && ndw->weight + change > 1) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
totchange -= 1.0f - ndw->weight;
ndw->weight = 1.0f;
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
/* stop the changes to this group */
change_status[ndw->def_nr] = changeto;
total_valid--;
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
else if (ndw->weight + change < 0) { /* check the lower bound */
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
totchange -= ndw->weight;
ndw->weight = 0;
change_status[ndw->def_nr] = changeto;
total_valid--;
}
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
else { /* a perfectly valid change occurred to ndw->weight */
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
totchange -= change;
ndw->weight += change;
}
/* see if there was a change */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (oldval != ndw->weight) {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
was_change = TRUE;
}
Made Multi-Paint support vertices containing locked groups Changed locking system to check the amount of space in unlocked groups ahead of time.
2011-06-14 19:11:01 +00:00
}
}
}
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* don't go again if there was no change, if there is no valid group,
* or there is no change left */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
} while (was_change && total_valid && totchange);
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* left overs */
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
return totchange;
2011-05-27 19:13:54 +00:00
}
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
static float get_mp_change(MDeformVert *odv, const int defbase_tot, const char *defbase_sel, float brush_change);
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* observe the changes made to the weights of groups.
* make sure all locked groups on the vertex have the same deformation
* by moving the changes made to groups onto other unlocked groups */
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
static void enforce_locks(MDeformVert *odv, MDeformVert *ndv,
const int defbase_tot, const char *defbase_sel,
const char *lock_flags, const char *vgroup_validmap,
char do_auto_normalize, char do_multipaint)
remove duplicate variable - wpaint_make_validmap(ob) was being called twice for no good reason.
2011-09-19 05:06:21 +00:00
{
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
float totchange = 0.0f;
float totchange_allowed = 0.0f;
float left_over;
Started adding vertex masking--supports regular painting, and setting weight (Shift+K) Removed my unreferenced vars
2011-07-18 17:38:17 +00:00
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
int total_valid = 0;
int total_changed = 0;
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
unsigned int i;
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
MDeformWeight *ndw;
MDeformWeight *odw;
The locking + multi-paint section of code needed correction and simplification: The ratios were only being maintained between the altered weights when they were redistributed, and the resulting weights did not fully respect the locks--now they do.
2011-11-29 02:23:59 +00:00
float changed_sum = 0.0f;
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
char *change_status;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!lock_flags || !has_locked_group(ndv, defbase_tot, vgroup_validmap, lock_flags)) {
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
return;
Heard that multi-bone selection would be better used for painting multiple bones; took out select lock. Added a basic multiple bone group paint feature "Multi-Paint" and its corresponding checkbox next to "Auto Normalize," but I need to access the ToolSettings for it in armature to make bone selection function/draw correctly When you multi-paint, it paints on selected bones while keeping the weight ratios on a vertex of the selected groups the same. You can't currently multi-paint on a vertex with a locked deform group.
2011-06-08 19:05:17 +00:00
}
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* record if a group was changed, unlocked and not changed, or locked */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
change_status = MEM_callocN(sizeof(char) * defbase_tot, "unlocked_unchanged");
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (i = 0; i < defbase_tot; i++) {
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
ndw = defvert_find_index(ndv, i);
odw = defvert_find_index(odv, i);
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* the weights are zero, so we can assume a lot */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!ndw || !odw) {
remove unused vars & minor formatting.
2011-11-29 06:50:18 +00:00
if (!lock_flags[i] && vgroup_validmap[i]) {
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
defvert_verify_index(odv, i);
defvert_verify_index(ndv, i);
total_valid++;
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
change_status[i] = 1; /* can be altered while redistributing */
Heard that multi-bone selection would be better used for painting multiple bones; took out select lock. Added a basic multiple bone group paint feature "Multi-Paint" and its corresponding checkbox next to "Auto Normalize," but I need to access the ToolSettings for it in armature to make bone selection function/draw correctly When you multi-paint, it paints on selected bones while keeping the weight ratios on a vertex of the selected groups the same. You can't currently multi-paint on a vertex with a locked deform group.
2011-06-08 19:05:17 +00:00
}
continue;
}
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* locked groups should not be changed */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (lock_flags[i]) {
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
ndw->weight = odw->weight;
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
else if (ndw->weight != odw->weight) { /* changed groups are handled here */
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
totchange += ndw->weight - odw->weight;
The locking + multi-paint section of code needed correction and simplification: The ratios were only being maintained between the altered weights when they were redistributed, and the resulting weights did not fully respect the locks--now they do.
2011-11-29 02:23:59 +00:00
changed_sum += ndw->weight;
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
change_status[i] = 2; /* was altered already */
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
total_changed++;
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
} /* unchanged, unlocked bone groups are handled here */
remove unused vars & minor formatting.
2011-11-29 06:50:18 +00:00
else if (vgroup_validmap[i]) {
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
totchange_allowed += ndw->weight;
total_valid++;
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
change_status[i] = 1; /* can be altered while redistributing */
Fixed Multi-Paint so that it doesn't stop painting unless the maximum cap has been met. Also, the color display now only shows colors for the areas that are shared by the selected groups. Finally, Multi-Paint responds to auto normalize, it determines when it can not be edited.
2011-06-10 19:47:53 +00:00
}
}
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* if there was any change, redistribute it */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (total_changed) {
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* auto normalize will allow weights to temporarily go above 1 in redistribution */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (vgroup_validmap && total_changed < 0 && total_valid) {
Tweaked multi-paint and the way the colors are displayed so one of the artists could see it- when you paint the active group, and makes the others match based on the change factor; so the active group being 0 is not handled.
2011-06-21 19:20:42 +00:00
totchange_allowed = total_valid;
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
/* the way you modify the unlocked + unchanged groups is different depending
While reviewing this part of the code for a Blender Proceedings article, I noticed that the lock enforcer was taking several improper steps to redistribute evenly with multi-paint. Beforehand, a few problems were in view: some of the indexing was changed towards the end to use the more efficient stack structure, but needed to use the correct def group indices. Also, the designated selected group would use its own value to acquire the standard to base change distributed to the others. Lastly, the total_change was used rather than -left_overs in the formula to compute the new designated weight within the means of the locks' allowed changes. Now, while maintaining the ratios of the selection, it correctly returns left over change that could not be redistributed to the unlocked groups.
2011-11-10 02:09:58 +00:00
* on whether or not you are painting the weight(s) up or down */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (totchange < 0) {
While reviewing this part of the code for a Blender Proceedings article, I noticed that the lock enforcer was taking several improper steps to redistribute evenly with multi-paint. Beforehand, a few problems were in view: some of the indexing was changed towards the end to use the more efficient stack structure, but needed to use the correct def group indices. Also, the designated selected group would use its own value to acquire the standard to base change distributed to the others. Lastly, the total_change was used rather than -left_overs in the formula to compute the new designated weight within the means of the locks' allowed changes. Now, while maintaining the ratios of the selection, it correctly returns left over change that could not be redistributed to the unlocked groups.
2011-11-10 02:09:58 +00:00
totchange_allowed = total_valid - totchange_allowed;
}
else {
totchange_allowed *= -1;
}
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* there needs to be change allowed, or you should not bother */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (totchange_allowed) {
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
left_over = 0;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (fabsf(totchange_allowed) < fabsf(totchange)) {
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* this amount goes back onto the changed, unlocked weights */
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
left_over = fabsf(fabsf(totchange) - fabsf(totchange_allowed));
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (totchange > 0) {
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
left_over *= -1;
}
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
}
else {
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* all of the change will be permitted */
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
totchange_allowed = -totchange;
}
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* move the weight evenly between the allowed groups, move excess back onto the used groups based on the change */
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
totchange_allowed = redistribute_change(ndv, defbase_tot, change_status, 1, -1, totchange_allowed, total_valid, do_auto_normalize);
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
left_over += totchange_allowed;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (left_over) {
The locking + multi-paint section of code needed correction and simplification: The ratios were only being maintained between the altered weights when they were redistributed, and the resulting weights did not fully respect the locks--now they do.
2011-11-29 02:23:59 +00:00
/* more than one nonzero weights were changed with the same ratio with multipaint, so keep them changed that way! */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (total_changed > 1 && do_multipaint) {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
float undo_change = get_mp_change(ndv, defbase_tot, defbase_sel, left_over);
multipaint_selection(ndv, defbase_tot, undo_change, defbase_sel);
The locking + multi-paint section of code needed correction and simplification: The ratios were only being maintained between the altered weights when they were redistributed, and the resulting weights did not fully respect the locks--now they do.
2011-11-29 02:23:59 +00:00
}
/* or designatedw is still -1 put weight back as evenly as possible */
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
else {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
redistribute_change(ndv, defbase_tot, change_status, 2, -2, left_over, total_changed, do_auto_normalize);
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
}
}
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
}
else {
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* reset the weights */
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
unsigned int i;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
MDeformWeight *dw_old = odv->dw;
MDeformWeight *dw_new = ndv->dw;
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = odv->totweight; i != 0; i--, dw_old++, dw_new++) {
dw_new->weight = dw_old->weight;
Made Multi-Paint support vertices containing locked groups Changed locking system to check the amount of space in unlocked groups ahead of time.
2011-06-14 19:11:01 +00:00
}
}
}
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
MEM_freeN(change_status);
Fixed Multi-Paint so that it doesn't stop painting unless the maximum cap has been met. Also, the color display now only shows colors for the areas that are shared by the selected groups. Finally, Multi-Paint responds to auto normalize, it determines when it can not be edited.
2011-06-10 19:47:53 +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
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* multi-paint's initial, potential change is computed here based on the user's stroke */
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
static float get_mp_change(MDeformVert *odv, const int defbase_tot, const char *defbase_sel, float brush_change)
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
{
Made multi-paint change the weight values based on the artist's suggestion. + fixed a huge problem with reseting the weights while using multi-paint.
2011-06-29 18:20:39 +00:00
float selwsum = 0.0f;
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
unsigned int i;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
MDeformWeight *dw = odv->dw;
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = odv->totweight; i != 0; i--, dw++) {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
if (dw->def_nr < defbase_tot) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (defbase_sel[dw->def_nr]) {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
selwsum += dw->weight;
}
Made multi-paint change the weight values based on the artist's suggestion. + fixed a huge problem with reseting the weights while using multi-paint.
2011-06-29 18:20:39 +00:00
}
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (selwsum && selwsum + brush_change > 0) {
return (selwsum + brush_change) / selwsum;
Made multi-paint change the weight values based on the artist's suggestion. + fixed a huge problem with reseting the weights while using multi-paint.
2011-06-29 18:20:39 +00:00
}
return 0.0f;
Tweaked multi-paint and the way the colors are displayed so one of the artists could see it- when you paint the active group, and makes the others match based on the change factor; so the active group being 0 is not handled.
2011-06-21 19:20:42 +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
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* change the weights back to the wv's weights
* it assumes you already have the correct pointer index */
vertex group changes, use more api functions more (some vertex group editing functions were copied about), also make some functions int oapi calls. - remove defgroup_find_index(), use BLI_findlink instead since they both work the same way. - move static function getNearestPointOnPlane() to BLI_math api function closest_to_plane_v3() - ED_vgroup_give_parray() added option to return an array where unselected verts are NULL (simplifies code & works for lattice when it didn't before). - more consistant error checking of ob->actdef.
2011-12-14 21:08:08 +00:00
static void defvert_reset_to_prev(MDeformVert *dv_prev, MDeformVert *dv)
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
MDeformWeight *dw = dv->dw;
vertex group changes, use more api functions more (some vertex group editing functions were copied about), also make some functions int oapi calls. - remove defgroup_find_index(), use BLI_findlink instead since they both work the same way. - move static function getNearestPointOnPlane() to BLI_math api function closest_to_plane_v3() - ED_vgroup_give_parray() added option to return an array where unselected verts are NULL (simplifies code & works for lattice when it didn't before). - more consistant error checking of ob->actdef.
2011-12-14 21:08:08 +00:00
MDeformWeight *dw_prev;
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
unsigned int i;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = dv->totweight; i != 0; i--, dw++) {
dw_prev = defvert_find_index(dv_prev, dw->def_nr);
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
/* if there was no w when there is a d, then the old weight was 0 */
vertex group changes, use more api functions more (some vertex group editing functions were copied about), also make some functions int oapi calls. - remove defgroup_find_index(), use BLI_findlink instead since they both work the same way. - move static function getNearestPointOnPlane() to BLI_math api function closest_to_plane_v3() - ED_vgroup_give_parray() added option to return an array where unselected verts are NULL (simplifies code & works for lattice when it didn't before). - more consistant error checking of ob->actdef.
2011-12-14 21:08:08 +00:00
dw->weight = dw_prev ? dw_prev->weight : 0.0f;
Heard that multi-bone selection would be better used for painting multiple bones; took out select lock. Added a basic multiple bone group paint feature "Multi-Paint" and its corresponding checkbox next to "Auto Normalize," but I need to access the ToolSettings for it in armature to make bone selection function/draw correctly When you multi-paint, it paints on selected bones while keeping the weight ratios on a vertex of the selected groups the same. You can't currently multi-paint on a vertex with a locked deform group.
2011-06-08 19:05:17 +00:00
}
Made multi-paint change the weight values based on the artist's suggestion. + fixed a huge problem with reseting the weights while using multi-paint.
2011-06-29 18:20:39 +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
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
static void clamp_weights(MDeformVert *dvert)
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
MDeformWeight *dw = dvert->dw;
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
unsigned int i;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = dvert->totweight; i != 0; i--, dw++) {
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
CLAMP(dw->weight, 0.0f, 1.0f);
Tweaked multi-paint and the way the colors are displayed so one of the artists could see it- when you paint the active group, and makes the others match based on the change factor; so the active group being 0 is not handled.
2011-06-21 19:20:42 +00:00
}
Heard that multi-bone selection would be better used for painting multiple bones; took out select lock. Added a basic multiple bone group paint feature "Multi-Paint" and its corresponding checkbox next to "Auto Normalize," but I need to access the ToolSettings for it in armature to make bone selection function/draw correctly When you multi-paint, it paints on selected bones while keeping the weight ratios on a vertex of the selected groups the same. You can't currently multi-paint on a vertex with a locked deform group.
2011-06-08 19:05:17 +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
remove duplicate variable - wpaint_make_validmap(ob) was being called twice for no good reason.
2011-09-19 05:06:21 +00:00
/* struct to avoid passing many args each call to do_weight_paint_vertex()
* this _could_ be made a part of the operators 'WPaintData' struct, or at
* least a member, but for now keep its own struct, initialized on every
* paint stroke update - campbell */
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
typedef struct WeightPaintInfo {
int defbase_tot;
/* both must add up to 'defbase_tot' */
int defbase_tot_sel;
int defbase_tot_unsel;
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
int vgroup_active; /* (ob->actdef - 1) */
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
int vgroup_mirror; /* mirror group or -1 */
minor changes, fix coming next (no functional edits).
2011-12-09 06:05:58 +00:00
const char *lock_flags; /* boolean array for locked bones,
* length of defbase_tot */
const char *defbase_sel; /* boolean array for selected bones,
* length of defbase_tot, cant be const because of how its passed */
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
minor changes, fix coming next (no functional edits).
2011-12-09 06:05:58 +00:00
const char *vgroup_validmap; /* same as WeightPaintData.vgroup_validmap,
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
* only added here for convenience */
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
char do_flip;
char do_multipaint;
vgroup_validmap needed to be assigned when locks were active.
2011-09-19 15:11:01 +00:00
char do_auto_normalize;
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
float brush_alpha_value; /* result of BKE_brush_alpha_get() */
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
} WeightPaintInfo;
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
/* fresh start to make multi-paint and locking modular */
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
/* returns TRUE if it thinks you need to reset the weights due to
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
* normalizing while multi-painting
*
* note: this assumes dw->def_nr range has been checked by the caller
*/
remove duplicate variable - wpaint_make_validmap(ob) was being called twice for no good reason.
2011-09-19 05:06:21 +00:00
static int apply_mp_locks_normalize(Mesh *me, const WeightPaintInfo *wpi,
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
const unsigned int index,
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
MDeformWeight *dw, MDeformWeight *tdw,
float change, float oldChange,
float oldw, float neww)
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
MDeformVert *dv = &me->dvert[index];
MDeformVert dv_test = {NULL};
Removed code I no longer needed for multi-paint's newer system. Added comments to the more complex functions.
2011-07-07 17:59:15 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dv_test.dw = MEM_dupallocN(dv->dw);
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
dv_test.flag = dv->flag;
dv_test.totweight = dv->totweight;
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
/* do not multi-paint if a locked group is selected or the active group is locked
* !lock_flags[dw->def_nr] helps if nothing is selected, but active group is locked */
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
if ( (wpi->lock_flags == NULL) ||
((wpi->lock_flags[dw->def_nr] == FALSE) && /* def_nr range has to be checked for by caller */
has_locked_group_selected(wpi->defbase_tot, wpi->defbase_sel, wpi->lock_flags) == FALSE))
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
{
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (wpi->do_multipaint && wpi->defbase_tot_sel > 1) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (change && change != 1) {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
multipaint_selection(dv, wpi->defbase_tot, change, wpi->defbase_sel);
Made multi-paint change the weight values based on the artist's suggestion. + fixed a huge problem with reseting the weights while using multi-paint.
2011-06-29 18:20:39 +00:00
}
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
}
else { /* this lets users paint normally, but don't let them paint locked groups */
Made Multi-Paint support vertices containing locked groups Changed locking system to check the amount of space in unlocked groups ahead of time.
2011-06-14 19:11:01 +00:00
dw->weight = neww;
Heard that multi-bone selection would be better used for painting multiple bones; took out select lock. Added a basic multiple bone group paint feature "Multi-Paint" and its corresponding checkbox next to "Auto Normalize," but I need to access the ToolSettings for it in armature to make bone selection function/draw correctly When you multi-paint, it paints on selected bones while keeping the weight ratios on a vertex of the selected groups the same. You can't currently multi-paint on a vertex with a locked deform group.
2011-06-08 19:05:17 +00:00
}
}
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
clamp_weights(dv);
Tweaked multi-paint and the way the colors are displayed so one of the artists could see it- when you paint the active group, and makes the others match based on the change factor; so the active group being 0 is not handled.
2011-06-21 19:20:42 +00:00
The locking + multi-paint section of code needed correction and simplification: The ratios were only being maintained between the altered weights when they were redistributed, and the resulting weights did not fully respect the locks--now they do.
2011-11-29 02:23:59 +00:00
enforce_locks(&dv_test, dv, wpi->defbase_tot, wpi->defbase_sel, wpi->lock_flags, wpi->vgroup_validmap, wpi->do_auto_normalize, wpi->do_multipaint);
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
another minor weightpaint change, dont pass do_auto_normalize as a bool arg to do_weight_paint_normalize_all(), just check before calling.
2012-01-13 02:25:15 +00:00
if (wpi->do_auto_normalize) {
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
/* XXX - should we pass the active group? - currently '-1' */
another minor weightpaint change, dont pass do_auto_normalize as a bool arg to do_weight_paint_normalize_all(), just check before calling.
2012-01-13 02:25:15 +00:00
do_weight_paint_normalize_all(dv, wpi->defbase_tot, wpi->vgroup_validmap);
}
Fixed a Multi-Paint + Auto Normalize issue. Beforehand, auto normalize could cause the weight to change as you brushed over vertices even if the change was less extreme than the last change.
2011-07-21 16:25:07 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (oldChange && wpi->do_multipaint && wpi->defbase_tot_sel > 1) {
if (tdw->weight != oldw) {
if (neww > oldw) {
if (tdw->weight <= oldw) {
remove cellalloc, from my tests jemalloc beats cellalloc, so we better just use a better malloc replacement. See Details: http://wiki.blender.org/index.php/User:Ideasman42/BMeshBranchReview#Update_43694
2012-01-25 20:18:12 +00:00
MEM_freeN(dv_test.dw);
Fixed a Multi-Paint + Auto Normalize issue. Beforehand, auto normalize could cause the weight to change as you brushed over vertices even if the change was less extreme than the last change.
2011-07-21 16:25:07 +00:00
return TRUE;
}
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
}
else {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (tdw->weight >= oldw) {
remove cellalloc, from my tests jemalloc beats cellalloc, so we better just use a better malloc replacement. See Details: http://wiki.blender.org/index.php/User:Ideasman42/BMeshBranchReview#Update_43694
2012-01-25 20:18:12 +00:00
MEM_freeN(dv_test.dw);
Fixed a Multi-Paint + Auto Normalize issue. Beforehand, auto normalize could cause the weight to change as you brushed over vertices even if the change was less extreme than the last change.
2011-07-21 16:25:07 +00:00
return TRUE;
}
}
}
}
remove cellalloc, from my tests jemalloc beats cellalloc, so we better just use a better malloc replacement. See Details: http://wiki.blender.org/index.php/User:Ideasman42/BMeshBranchReview#Update_43694
2012-01-25 20:18:12 +00:00
MEM_freeN(dv_test.dw);
Fixed a Multi-Paint + Auto Normalize issue. Beforehand, auto normalize could cause the weight to change as you brushed over vertices even if the change was less extreme than the last change.
2011-07-21 16:25:07 +00:00
return FALSE;
Heard that multi-bone selection would be better used for painting multiple bones; took out select lock. Added a basic multiple bone group paint feature "Multi-Paint" and its corresponding checkbox next to "Auto Normalize," but I need to access the ToolSettings for it in armature to make bone selection function/draw correctly When you multi-paint, it paints on selected bones while keeping the weight ratios on a vertex of the selected groups the same. You can't currently multi-paint on a vertex with a locked deform group.
2011-06-08 19:05:17 +00:00
}
Made Multi-Paint and Locking more independent to better support future features. (an if statement surrounding Multi-Paint still checks the lock flags to see if it should bother changing anything) Also, I changed lock's redistribution method so that if there was no enough space on other unlocked groups, it tries to keep the new weights' ratios to each other
2011-06-16 19:05:05 +00:00
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
/* within the current dvert index, get the dw that is selected and has a weight
* above 0, this helps multi-paint */
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
static int get_first_selected_nonzero_weight(MDeformVert *dvert, const int defbase_tot, const char *defbase_sel)
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
{
Made multi-paint change the weight values based on the artist's suggestion. + fixed a huge problem with reseting the weights while using multi-paint.
2011-06-29 18:20:39 +00:00
int i;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
MDeformWeight *dw = dvert->dw;
for (i = 0; i < dvert->totweight; i++, dw++) {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
if (dw->def_nr < defbase_tot) {
if (defbase_sel[dw->def_nr] && dw->weight > 0.0f) {
return i;
}
Made multi-paint change the weight values based on the artist's suggestion. + fixed a huge problem with reseting the weights while using multi-paint.
2011-06-29 18:20:39 +00:00
}
}
return -1;
}
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
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
static void do_weight_paint_vertex(
/* vars which remain the same for every vert */
VPaint *wp, Object *ob, const WeightPaintInfo *wpi,
/* vars which change on each stroke */
const unsigned int index, float alpha, float paintweight
)
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Mesh *me = ob->data;
MDeformVert *dv = &me->dvert[index];
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
'uw' was used in weight paint code for previous deform weight, renamed to 'dw_prev'
2012-01-13 08:18:22 +00:00
MDeformWeight *dw, *dw_prev;
2011-05-27 19:13:54 +00:00
minor edits to main weight paint function for better readability - do_weight_paint_vertex(), no functional changes.
2012-01-13 02:17:29 +00:00
/* mirror vars */
int index_mirr;
int vgroup_mirr;
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
MDeformVert *dv_mirr;
MDeformWeight *dw_mirr;
2011-05-27 19:13:54 +00:00
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
const short do_multipaint_totsel = (wpi->do_multipaint && wpi->defbase_tot_sel > 1);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (wp->flag & VP_ONLYVGROUP) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dw = defvert_find_index(dv, wpi->vgroup_active);
dw_prev = defvert_find_index(wp->wpaint_prev + index, wpi->vgroup_active);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
else {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dw = defvert_verify_index(dv, wpi->vgroup_active);
dw_prev = defvert_verify_index(wp->wpaint_prev + index, wpi->vgroup_active);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
cleanup for main weight paint drawing function while looking into a bug - no functional changes.
2011-10-06 03:57:03 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (dw == NULL || dw_prev == NULL) {
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
return;
cleanup for main weight paint drawing function while looking into a bug - no functional changes.
2011-10-06 03:57:03 +00:00
}
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
minor edits to main weight paint function for better readability - do_weight_paint_vertex(), no functional changes.
2012-01-13 02:17:29 +00:00
/* from now on we can check if mirrors enabled if this var is -1 and not bother with the flag */
if (me->editflag & ME_EDIT_MIRROR_X) {
index_mirr = mesh_get_x_mirror_vert(ob, index);
vgroup_mirr = (wpi->vgroup_mirror != -1) ? wpi->vgroup_mirror : wpi->vgroup_active;
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
/* another possible error - mirror group _and_ active group are the same (which is fine),
* but we also are painting onto a center vertex - this would paint the same weight twice */
if (index_mirr == index && vgroup_mirr == wpi->vgroup_active) {
index_mirr = vgroup_mirr = -1;
}
minor edits to main weight paint function for better readability - do_weight_paint_vertex(), no functional changes.
2012-01-13 02:17:29 +00:00
}
else {
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
index_mirr = vgroup_mirr = -1;
minor edits to main weight paint function for better readability - do_weight_paint_vertex(), no functional changes.
2012-01-13 02:17:29 +00:00
}
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
/* get the mirror def vars */
if (index_mirr != -1) {
dv_mirr = &me->dvert[index_mirr];
if (wp->flag & VP_ONLYVGROUP) {
dw_mirr = defvert_find_index(dv_mirr, vgroup_mirr);
if (dw_mirr == NULL) {
index_mirr = vgroup_mirr = -1;
dv_mirr = NULL;
}
}
else {
fix for weight paint when the mirror vertex was allocated (would free the original verts weight). was an error in own recent commit.
2012-01-14 18:52:34 +00:00
if (index != index_mirr) {
dw_mirr = defvert_verify_index(dv_mirr, vgroup_mirr);
}
else {
/* dv and dv_mirr are the same */
int totweight_prev = dv_mirr->totweight;
int dw_offset = (int)(dw - dv_mirr->dw);
dw_mirr = defvert_verify_index(dv_mirr, vgroup_mirr);
/* if we added another, get our old one back */
if (totweight_prev != dv_mirr->totweight) {
dw = &dv_mirr->dw[dw_offset];
}
}
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
}
}
else {
dv_mirr = NULL;
dw_mirr = NULL;
}
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
/* TODO: De-duplicate the simple weight paint - jason */
/* ... or not, since its <10 SLOC - campbell */
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
/* If there are no locks or multipaint,
* then there is no need to run the more complicated checks */
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
if ( (do_multipaint_totsel == FALSE) &&
patch from Jason Hays --- Locking only redistributes or restricts weights when using bone groups. So, in addition to adding a NULL check to my last bit of code, I made has_locked_group() check for bone groups.
2011-12-30 11:31:48 +00:00
(wpi->lock_flags == NULL || has_locked_group(dv, wpi->defbase_tot, wpi->vgroup_validmap, wpi->lock_flags) == FALSE))
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
{
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
dw->weight = wpaint_blend(wp, dw->weight, dw_prev->weight, alpha, paintweight,
wpi->brush_alpha_value, wpi->do_flip, FALSE);
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
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
/* WATCH IT: take care of the ordering of applying mirror -> normalize,
* can give wrong results [#26193], least confusing if normalize is done last */
minor edits to main weight paint function for better readability - do_weight_paint_vertex(), no functional changes.
2012-01-13 02:17:29 +00:00
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
/* apply mirror */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (index_mirr != -1) {
minor edits to main weight paint function for better readability - do_weight_paint_vertex(), no functional changes.
2012-01-13 02:17:29 +00:00
/* copy, not paint again */
dw_mirr->weight = dw->weight;
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
}
fix [#26193] Weightpainting on Mesh with Armature-Modifier fails if x-mirror and auto normalize is enabled
2011-10-06 04:06:47 +00:00
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
/* apply normalize */
another minor weightpaint change, dont pass do_auto_normalize as a bool arg to do_weight_paint_normalize_all(), just check before calling.
2012-01-13 02:25:15 +00:00
if (wpi->do_auto_normalize) {
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
/* note on normalize - this used to be applied after painting and normalize all weights,
* in some ways this is good because there is feedback where the more weights involved would
style cleanup - spelling corrections & update some incorrect comments.
2012-03-03 11:45:08 +00:00
* 'resist' so you couldn't instantly zero out other weights by painting 1.0 on the active.
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
*
* However this gave a problem since applying mirror, then normalize both verts
* the resulting weight wont match on both sides.
*
* If this 'resisting', slower normalize is nicer, we could call
* do_weight_paint_normalize_all() and only use...
* do_weight_paint_normalize_all_active() when normalizing the mirror vertex.
* - campbell
*/
do_weight_paint_normalize_all_active(dv, wpi->defbase_tot, wpi->vgroup_validmap, wpi->vgroup_active);
if (index_mirr != -1) {
/* only normalize if this is not a center vertex, else we get a conflict, normalizing twice */
if (index != index_mirr) {
do_weight_paint_normalize_all_active(dv_mirr, wpi->defbase_tot, wpi->vgroup_validmap, vgroup_mirr);
}
else {
/* this case accounts for...
* - painting onto a center vertex of a mesh
* - x mirror is enabled
* - auto normalize is enabled
* - the group you are painting onto has a L / R version
*
style cleanup - spelling corrections & update some incorrect comments.
2012-03-03 11:45:08 +00:00
* We want L/R vgroups to have the same weight but this cant be if both are over 0.5,
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
* We _could_ have special check for that, but this would need its own normalize function which
* holds 2 groups from changing at once.
*
* So! just balance out the 2 weights, it keeps them equal and everything normalized.
*
code cleanup: spelling
2012-05-20 21:23:26 +00:00
* While it wont hit the desired weight immediately as the user waggles their mouse,
fix [#29832] Weightpainting with "x-mirror" and "auto normalize" fails for center bones normalize function simply wasn't called on the mirror vertex. also fix 3 other bugs / inconsistencies * when mirror is enabled, center verts get themselves as the mirror vertex, wpaint code didn't check for this case, mirroring the vertex to it self (would work, but unneeded). * normalizing after painting would scale the active weight too, now keep the painted weight and adjust others when normalizing. * VP_ONLYVGROUP wasn't respected for mirror (mirror vertex group would always be added).
2012-01-13 05:52:34 +00:00
* constant painting and re-normalizing will get there. this is also just simpler logic.
* - campbell */
dw_mirr->weight = dw->weight = (dw_mirr->weight + dw->weight) * 0.5f;
}
}
another minor weightpaint change, dont pass do_auto_normalize as a bool arg to do_weight_paint_normalize_all(), just check before calling.
2012-01-13 02:25:15 +00:00
}
edits to radish before merge with trunk - removed some unused functions. - renamed vars to make more sense paint_vertex.c 'flags' --> 'lock_flags' - some odd modifications were made in unrealted, commented code, copy these back from trunk. - rename vertex_group_fix 'cp' property to 'accuracy' - make style more consistant with trunk. - remove 'Radish' comments.
2011-09-19 02:43:03 +00:00
}
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
else {
/* use locks and/or multipaint */
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
float oldw;
float neww;
quiet warnings
2012-06-03 10:33:28 +00:00
/* float testw = 0; */ /* UNUSED */
This fixes a precision issue in multi-paint so that near zero values do not cause flickering as you paint. It also changes multi-paint's "zero weight color" to black again--it was unintentionally changed to red some time late last year when an aspect of the colors were changed.
2012-05-31 17:22:52 +00:00
float observedChange = 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
float change = 0;
float oldChange = 0;
int i;
'uw' was used in weight paint code for previous deform weight, renamed to 'dw_prev'
2012-01-13 08:18:22 +00:00
MDeformWeight *tdw = NULL, *tdw_prev;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
MDeformVert dv_copy = {NULL};
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +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
oldw = dw->weight;
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
neww = wpaint_blend(wp, dw->weight, dw_prev->weight, alpha, paintweight,
wpi->brush_alpha_value, wpi->do_flip, do_multipaint_totsel);
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
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* setup multi-paint */
This fixes a precision issue in multi-paint so that near zero values do not cause flickering as you paint. It also changes multi-paint's "zero weight color" to black again--it was unintentionally changed to red some time late last year when an aspect of the colors were changed.
2012-05-31 17:22:52 +00:00
observedChange = neww - oldw;
if (do_multipaint_totsel && observedChange) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dv_copy.dw = MEM_dupallocN(dv->dw);
cleanup for main weight paint drawing function while looking into a bug - no functional changes.
2011-10-06 03:57:03 +00:00
dv_copy.flag = dv->flag;
dv_copy.totweight = dv->totweight;
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
tdw = dw;
'uw' was used in weight paint code for previous deform weight, renamed to 'dw_prev'
2012-01-13 08:18:22 +00:00
tdw_prev = dw_prev;
This fixes a precision issue in multi-paint so that near zero values do not cause flickering as you paint. It also changes multi-paint's "zero weight color" to black again--it was unintentionally changed to red some time late last year when an aspect of the colors were changed.
2012-05-31 17:22:52 +00:00
change = get_mp_change(&wp->wpaint_prev[index], wpi->defbase_tot, wpi->defbase_sel, observedChange);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (change) {
if (!tdw->weight) {
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
i = get_first_selected_nonzero_weight(dv, wpi->defbase_tot, wpi->defbase_sel);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (i >= 0) {
cleanup for main weight paint drawing function while looking into a bug - no functional changes.
2011-10-06 03:57:03 +00:00
tdw = &(dv->dw[i]);
'uw' was used in weight paint code for previous deform weight, renamed to 'dw_prev'
2012-01-13 08:18:22 +00:00
tdw_prev = defvert_verify_index(&wp->wpaint_prev[index], tdw->def_nr);
style changes only
2011-09-18 14:54:41 +00:00
}
else {
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
change = 0;
}
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (change && tdw_prev->weight && tdw_prev->weight * change) {
if (tdw->weight != tdw_prev->weight) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
oldChange = tdw->weight / tdw_prev->weight;
quiet warnings
2012-06-03 10:33:28 +00:00
/* testw = tdw_prev->weight * change; */ /* UNUSED */
This fixes a precision issue in multi-paint so that near zero values do not cause flickering as you paint. It also changes multi-paint's "zero weight color" to black again--it was unintentionally changed to red some time late last year when an aspect of the colors were changed.
2012-05-31 17:22:52 +00:00
if (observedChange > 0) {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (change > oldChange) {
remove duplicate variable - wpaint_make_validmap(ob) was being called twice for no good reason.
2011-09-19 05:06:21 +00:00
/* reset the weights and use the new change */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
defvert_reset_to_prev(wp->wpaint_prev + index, dv);
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
}
else {
remove duplicate variable - wpaint_make_validmap(ob) was being called twice for no good reason.
2011-09-19 05:06:21 +00:00
/* the old change was more significant, so set
* the change to 0 so that it will not do another multi-paint */
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
change = 0;
}
style changes only
2011-09-18 14:54:41 +00:00
}
else {
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (change < oldChange) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
defvert_reset_to_prev(wp->wpaint_prev + index, dv);
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
}
else {
change = 0;
}
Made multi-paint change the weight values based on the artist's suggestion. + fixed a huge problem with reseting the weights while using multi-paint.
2011-06-29 18:20:39 +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
else {
change = 0;
}
style changes only
2011-09-18 14:54:41 +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
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (apply_mp_locks_normalize(me, wpi, index, dw, tdw, change, oldChange, oldw, neww)) {
vertex group changes, use more api functions more (some vertex group editing functions were copied about), also make some functions int oapi calls. - remove defgroup_find_index(), use BLI_findlink instead since they both work the same way. - move static function getNearestPointOnPlane() to BLI_math api function closest_to_plane_v3() - ED_vgroup_give_parray() added option to return an array where unselected verts are NULL (simplifies code & works for lattice when it didn't before). - more consistant error checking of ob->actdef.
2011-12-14 21:08:08 +00:00
defvert_reset_to_prev(&dv_copy, dv);
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
change = 0;
oldChange = 0;
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (dv_copy.dw) {
remove cellalloc, from my tests jemalloc beats cellalloc, so we better just use a better malloc replacement. See Details: http://wiki.blender.org/index.php/User:Ideasman42/BMeshBranchReview#Update_43694
2012-01-25 20:18:12 +00:00
MEM_freeN(dv_copy.dw);
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
}
- possible fix for vertex paint 'fill' crash. - remove unneeded call to defvert_find_index() when weight painting.
2011-11-10 06:06:35 +00:00
#if 0
cleanup for main weight paint drawing function while looking into a bug - no functional changes.
2011-10-06 03:57:03 +00:00
/* dv may have been altered greatly */
dw = defvert_find_index(dv, vgroup);
- possible fix for vertex paint 'fill' crash. - remove unneeded call to defvert_find_index() when weight painting.
2011-11-10 06:06:35 +00:00
#else
code cleanup: spelling
2012-05-20 21:23:26 +00:00
dw = NULL; /* UNUSED after assignment, set to NULL to ensure we don't
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
* use again, we thats needed un-ifdef the line above */
- possible fix for vertex paint 'fill' crash. - remove unneeded call to defvert_find_index() when weight painting.
2011-11-10 06:06:35 +00:00
(void)dw; /* quiet warnigns */
#endif
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
minor edits to main weight paint function for better readability - do_weight_paint_vertex(), no functional changes.
2012-01-13 02:17:29 +00:00
/* x mirror painting */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (index_mirr != -1) {
minor edits to main weight paint function for better readability - do_weight_paint_vertex(), no functional changes.
2012-01-13 02:17:29 +00:00
/* copy, not paint again */
/* dw_mirr->weight = dw->weight; */ /* TODO, explain the logic in not assigning weight! - campbell */
apply_mp_locks_normalize(me, wpi, index_mirr, dw_mirr, tdw, change, oldChange, oldw, neww);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
}
}
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* *************** set wpaint operator ****************** */
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
static int set_wpaint(bContext *C, wmOperator *UNUSED(op)) /* toggle */
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Object *ob = CTX_data_active_object(C);
Scene *scene = CTX_data_scene(C);
VPaint *wp = scene->toolsettings->wpaint;
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
Mesh *me;
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
me = BKE_mesh_from_object(ob);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (ob->id.lib || me == NULL) return OPERATOR_PASS_THROUGH;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob->mode & OB_MODE_WEIGHT_PAINT) ob->mode &= ~OB_MODE_WEIGHT_PAINT;
2.5/Paint: * Weightpaint is now object-local like sculpt and vertexpaint. * Fixed a bug spotted by DingTo, going from editmode to sculptmode didn't fully leave editmode
2009-08-15 21:46:25 +00:00
else ob->mode |= OB_MODE_WEIGHT_PAINT;
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* Weightpaint works by overriding colors in mesh,
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
* so need to make sure we recalc on enter and
* exit (exit needs doing regardless because we
* should redeform).
*/
DAG_id_tag_update was being called with non object ID's and OB_RECALC_* flags which only apply to objects. harmless but misleading.
2011-01-03 12:41:16 +00:00
DAG_id_tag_update(&me->id, 0);
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob->mode & OB_MODE_WEIGHT_PAINT) {
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
Object *par;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (wp == NULL)
wp = scene->toolsettings->wpaint = new_vpaint(1);
Changed vertexpaint and weightpaint to use the standard Brush struct, so they too work with the brush panel. Note: these modes are only using color/alpha/size from Brush, so there's more integration work todo yet.
2009-03-11 00:43:08 +00:00
mask now draws in the image view, misc minor edits.
2012-07-25 13:44:59 +00:00
BKE_paint_init(&wp->paint, PAINT_CURSOR_WEIGHT_PAINT);
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
paint_cursor_start(C, weight_paint_poll);
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
re-enable mirroring - it was commented in a few functions.
2011-10-28 14:31:15 +00:00
mesh_octree_table(ob, NULL, NULL, 's');
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* verify if active weight group is also active bone */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
par = modifiers_isDeformedByArmature(ob);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (par && (par->mode & OB_MODE_POSE)) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
bArmature *arm = par->data;
use armature active bone as a pointer rather then a flag for each bone that needs looking up. - rna vars arm.bones.active & rna.edit_bones.active - needed special undo support. - readfile.c loads. - duplicate and copy_armature support. - keep the draw flag, renamed to BONE_DRAW_ACTIVE, only use for openGL drawing. Note: it may be better to allow active/unselected as with objects.
2009-11-09 21:03:54 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (arm->act_bone)
use armature active bone as a pointer rather then a flag for each bone that needs looking up. - rna vars arm.bones.active & rna.edit_bones.active - needed special undo support. - readfile.c loads. - duplicate and copy_armature support. - keep the draw flag, renamed to BONE_DRAW_ACTIVE, only use for openGL drawing. Note: it may be better to allow active/unselected as with objects.
2009-11-09 21:03:54 +00:00
ED_vgroup_select_by_name(ob, arm->act_bone->name);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
}
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
else {
re-enable mirroring - it was commented in a few functions.
2011-10-28 14:31:15 +00:00
mesh_octree_table(NULL, NULL, NULL, 'e');
mesh_mirrtopo_table(NULL, 'e');
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
WM_event_add_notifier(C, NC_SCENE | ND_MODE, scene);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
return OPERATOR_FINISHED;
}
2.5 Paint mode (VPaint WPaint) was too easy to enter, I made the operators having a more designated poll() to check stuff. Now CTRL+TAB hotkeys will work in editmode for select type, and outside editmode for wpaint or posemode. Also fixed select type operator to so it works for facemode.
2009-02-01 13:24:19 +00:00
/* for switching to/from mode */
static int paint_poll_test(bContext *C)
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Object *ob = CTX_data_active_object(C);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (CTX_data_edit_object(C))
2.5 Paint mode (VPaint WPaint) was too easy to enter, I made the operators having a more designated poll() to check stuff. Now CTRL+TAB hotkeys will work in editmode for select type, and outside editmode for wpaint or posemode. Also fixed select type operator to so it works for facemode.
2009-02-01 13:24:19 +00:00
return 0;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (CTX_data_active_object(C) == NULL)
2.5 Paint mode (VPaint WPaint) was too easy to enter, I made the operators having a more designated poll() to check stuff. Now CTRL+TAB hotkeys will work in editmode for select type, and outside editmode for wpaint or posemode. Also fixed select type operator to so it works for facemode.
2009-02-01 13:24:19 +00:00
return 0;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (!ob->data || ((ID *)ob->data)->lib)
Fix #29603: Mode switch on linked objects Do not allow to enter to weight paint mode for proxied objects.
2011-12-12 18:25:52 +00:00
return 0;
2.5 Paint mode (VPaint WPaint) was too easy to enter, I made the operators having a more designated poll() to check stuff. Now CTRL+TAB hotkeys will work in editmode for select type, and outside editmode for wpaint or posemode. Also fixed select type operator to so it works for facemode.
2009-02-01 13:24:19 +00:00
return 1;
}
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
void PAINT_OT_weight_paint_toggle(wmOperatorType *ot)
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
{
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Weight Paint Mode";
ot->idname = "PAINT_OT_weight_paint_toggle";
Second part of fix for [#31157]: Some (actually, 172) operators have no tooltip. About 30 undocumented ops remaining...
2012-05-05 17:10:51 +00:00
ot->description = "Toggle weight paint mode in 3D view";
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = set_wpaint;
ot->poll = paint_poll_test;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
2.5 Big commit, but mainly adminstration. - Enabled ot->flag OPTYPE_UNDO to work. - Removed all redundant ED_undo_pushes, but I'd recommend everyone to check it while testing. :) - Added view manipulations as OPTYPE_REGISTER, although this will flood the redo stack a bit... Nevertheless; for a "redo last action" panel we can simply check if both flags are set for redo. - Bugfix in editmode undo: selectmode was cleared, so you couldn't select after undo - Bugfix in mixing tweaks and keymaps... solution works but is weak, need to think over a while.
2009-01-31 19:40:40 +00:00
/* flags */
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
2.5 Big commit, but mainly adminstration. - Enabled ot->flag OPTYPE_UNDO to work. - Removed all redundant ED_undo_pushes, but I'd recommend everyone to check it while testing. :) - Added view manipulations as OPTYPE_REGISTER, although this will flood the redo stack a bit... Nevertheless; for a "redo last action" panel we can simply check if both flags are set for redo. - Bugfix in editmode undo: selectmode was cleared, so you couldn't select after undo - Bugfix in mixing tweaks and keymaps... solution works but is weak, need to think over a while.
2009-01-31 19:40:40 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* ************ weight paint operator ********** */
struct WPaintData {
ViewContext vc;
int *indexar;
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
int vgroup_active;
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
int vgroup_mirror;
float *vertexcosnos;
float wpimat[3][3];
added an 'auto-normalize' option for weight paint mode, that automatically ensures vertex groups that affect bones all add up to 1.0. please test and give feedback.
2009-10-30 02:09:52 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
/* variables for auto normalize */
const char *vgroup_validmap; /* stores if vgroups tie to deforming bones or not */
minor changes, fix coming next (no functional edits).
2011-12-09 06:05:58 +00:00
const char *lock_flags;
vgroup_validmap needed to be assigned when locks were active.
2011-09-19 15:11:01 +00:00
int defbase_tot;
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
};
Add input sample averaging to PaintStroke. Averages input samples to make the brush stroke smoother. Only mouse location is averaged right now, not pressure/tilt/etc. The DNA is in struct Paint.num_input_samples, RNA is Paint.input_samples. In combination with PaintStroke usage this change applies to sculpt, vpaint, and wpaint. The range of useful values varies quite a bit depending on input device; mouse needs higher values to match tablet pen, so set max samples pretty high (64). Release note section: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Sculpting#Input_Stroke_Averaging
2012-05-21 23:32:46 +00:00
static int wpaint_stroke_test_start(bContext *C, wmOperator *op, const float UNUSED(mouse[2]))
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Scene *scene = CTX_data_scene(C);
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
struct PaintStroke *stroke = op->customdata;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
ToolSettings *ts = scene->toolsettings;
VPaint *wp = ts->wpaint;
Object *ob = CTX_data_active_object(C);
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
struct WPaintData *wpd;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
Mesh *me;
fix [#29686] Weight paint paints when it shouldn't disallow painting when active group is locked
2011-12-30 11:37:54 +00:00
bDeformGroup *dg;
style edits for function declarations
2011-12-30 07:55:15 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
float mat[4][4], imat[4][4];
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (scene->obedit) {
fix [#29686] Weight paint paints when it shouldn't disallow painting when active group is locked
2011-12-30 11:37:54 +00:00
return FALSE;
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
me = BKE_mesh_from_object(ob);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (me == NULL || me->totpoly == 0) return OPERATOR_PASS_THROUGH;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* if nothing was added yet, we make dverts and a vertex deform group */
Bugfix #25261 Adding weightgroup in weight-paint now sends notifier, so buttons update
2010-12-17 16:04:05 +00:00
if (!me->dvert) {
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
ED_vgroup_data_create(&me->id);
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
Bugfix #25261 Adding weightgroup in weight-paint now sends notifier, so buttons update
2010-12-17 16:04:05 +00:00
}
fix error in last commit & remove commented code which is now working in 2.5x.
2011-10-06 02:19:04 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* this happens on a Bone select, when no vgroup existed yet */
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
if (ob->actdef <= 0) {
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
Object *modob;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if ((modob = modifiers_isDeformedByArmature(ob))) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Bone *actbone = ((bArmature *)modob->data)->act_bone;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (actbone) {
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
bPoseChannel *pchan = BKE_pose_channel_find_name(modob->pose, actbone->name);
revert for last commit, this should fix the proplem properly. - selected bones on hidden layers would be selected for weight painting (confusing to the user). use the 'active' bone instead. - when no weight group was set, the index used for the bone group was off by 1.
2010-01-18 16:21:23 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (pchan) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
bDeformGroup *dg = defgroup_find_name(ob, pchan->name);
if (dg == NULL) {
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
dg = ED_vgroup_add_name(ob, pchan->name); /* sets actdef */
fix for NULL pointer free and add in some checks, while looking into bug [#29521], add asserts so we know if an invalid active index is ever set.
2011-12-07 09:13:15 +00:00
}
else {
Code cleanup: fix a few warnings (>= 0 and == -1 tests on unsigned types).
2011-12-17 01:13:02 +00:00
int actdef = 1 + BLI_findindex(&ob->defbase, dg);
BLI_assert(actdef >= 0);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
ob->actdef = actdef;
fix for NULL pointer free and add in some checks, while looking into bug [#29521], add asserts so we know if an invalid active index is ever set.
2011-12-07 09:13:15 +00:00
}
revert for last commit, this should fix the proplem properly. - selected bones on hidden layers would be selected for weight painting (confusing to the user). use the 'active' bone instead. - when no weight group was set, the index used for the bone group was off by 1.
2010-01-18 16:21:23 +00:00
}
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
}
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
}
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (ob->defbase.first == NULL) {
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
ED_vgroup_add(ob);
revert for last commit, this should fix the proplem properly. - selected bones on hidden layers would be selected for weight painting (confusing to the user). use the 'active' bone instead. - when no weight group was set, the index used for the bone group was off by 1.
2010-01-18 16:21:23 +00:00
}
fix error in last commit & remove commented code which is now working in 2.5x.
2011-10-06 02:19:04 +00:00
spelling cleanup
2012-03-18 07:38:51 +00:00
/* ensure we don't try paint onto an invalid group */
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
if (ob->actdef <= 0) {
fix [#29686] Weight paint paints when it shouldn't disallow painting when active group is locked
2011-12-30 11:37:54 +00:00
BKE_report(op->reports, RPT_WARNING, "No active vertex group for painting, aborting");
return FALSE;
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
}
style edits for function declarations
2011-12-30 07:55:15 +00:00
/* check if we are attempting to paint onto a locked vertex group,
* and other options disallow it from doing anything useful */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dg = BLI_findlink(&ob->defbase, (ob->actdef - 1));
fix [#29686] Weight paint paints when it shouldn't disallow painting when active group is locked
2011-12-30 11:37:54 +00:00
if (dg->flag & DG_LOCK_WEIGHT) {
BKE_report(op->reports, RPT_WARNING, "Active group is locked, aborting");
return FALSE;
style edits for function declarations
2011-12-30 07:55:15 +00:00
}
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
/* ALLOCATIONS! no return after this line */
/* make mode data storage */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
wpd = MEM_callocN(sizeof(struct WPaintData), "WPaintData");
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
paint_stroke_set_mode_data(stroke, wpd);
view3d_set_viewcontext(C, &wpd->vc);
wpd->vgroup_active = ob->actdef - 1;
wpd->vgroup_mirror = -1;
/* set up auto-normalize, and generate map for detecting which
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
* vgroups affect deform bones */
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
wpd->defbase_tot = BLI_countlist(&ob->defbase);
code cleanup: move functions for getting defgroup arrays from objects out of editors into blenkernel, since they are generally useful.
2012-09-05 02:51:55 +00:00
wpd->lock_flags = BKE_objdef_lock_flags_get(ob, wpd->defbase_tot);
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
if (ts->auto_normalize || ts->multipaint || wpd->lock_flags) {
code cleanup: move functions for getting defgroup arrays from objects out of editors into blenkernel, since they are generally useful.
2012-09-05 02:51:55 +00:00
wpd->vgroup_validmap = BKE_objdef_validmap_get(ob, wpd->defbase_tot);
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
}
/* painting on subsurfs should give correct points too, this returns me->totvert amount */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
wpd->vertexcosnos = mesh_get_mapped_verts_nors(scene, ob);
wpd->indexar = get_indexarray(me);
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
copy_wpaint_prev(wp, me->dvert, me->totvert);
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* imat for normals */
Math lib: matrix multiplication order fix for two functions that were inconsistent with similar functions & math notation: mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B) mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B) For branch maintainers, it should be relatively simple to fix things manually, it's also possible run this script after merging to do automatic replacement: http://www.pasteall.org/27459/python
2011-12-16 19:53:12 +00:00
mult_m4_m4m4(mat, wpd->vc.rv3d->viewmat, ob->obmat);
Math Lib * Convert all code to use new functions. * Branch maintainers may want to skip this commit, and run this conversion script instead, if they use a lot of math functions in new code: http://www.pasteall.org/9052/python
2009-11-10 20:43:45 +00:00
invert_m4_m4(imat, mat);
copy_m3_m4(wpd->wpimat, imat);
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* if mirror painting, find the other group */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (me->editflag & ME_EDIT_MIRROR_X) {
minor edits to weight paint * store the active vertex group (avoid doing ob->actdef-1 for every vertex) * ensure the active vertex group isn't less then 0.
2011-12-30 02:16:07 +00:00
wpd->vgroup_mirror = wpaint_mirror_vgroup_ensure(ob, wpd->vgroup_active);
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
}
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
fix [#29686] Weight paint paints when it shouldn't disallow painting when active group is locked
2011-12-30 11:37:54 +00:00
return TRUE;
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
}
static void wpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, PointerRNA *itemptr)
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Scene *scene = CTX_data_scene(C);
ToolSettings *ts = CTX_data_tool_settings(C);
VPaint *wp = ts->wpaint;
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
Brush *brush = paint_brush(&wp->paint);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
struct WPaintData *wpd = paint_stroke_mode_data(stroke);
Bugfix #20173: Crash with Weight Paint on polygons with no faces
2009-12-20 10:50:40 +00:00
ViewContext *vc;
Object *ob;
Mesh *me;
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
float mat[4][4];
remove redundant assignments & unused vars. also minor functional changes - OBJECT_OT_make_links_data() type property is now assigned to the operator property (so popup menu can find it) - removing BG image now returns cancelled if no image is removed.
2011-01-12 03:41:12 +00:00
float paintweight;
Bugfix #20173: Crash with Weight Paint on polygons with no faces
2009-12-20 10:50:40 +00:00
int *indexar;
improvement to how weight paint blur works * the accumulated blur weight now takes into account how far verts are from the brush, giving more even results * verts where the weight wasnt found were being ignored, now treat them as zero weight verts.
2011-12-30 04:38:45 +00:00
float totw;
style changes & use faster looping on vertex weights, also loop on face verts in more places rather then having code for 3-4 verts.
2011-09-19 17:53:37 +00:00
unsigned int index, totindex;
* Removed tablet pressure sensitive number field widget scrubbing, wasn't that useful and I suspect it was the cause of a few bugs * Added tablet pressure support (size/strength) for weight paint and vertex paint * Added tablet eraser support for weight paint and vertex paint (inverts the effect of the current tool) * Removed the old 'soft' option, now weight paint and vertex paint use the influence curve * Made the default brush use a smooth influence curve, rather than sharp
2009-11-20 01:39:27 +00:00
float alpha;
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
float mval[2];
some picky rna/variable renaming: Mesh.wp_vert_sel --> use_paint_mask_vertex
2011-09-14 08:45:12 +00:00
int use_vert_sel;
Started adding vertex masking--supports regular painting, and setting weight (Shift+K) Removed my unreferenced vars
2011-07-18 17:38:17 +00:00
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
const float pressure = RNA_float_get(itemptr, "pressure");
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
const float brush_size_pressure = BKE_brush_size_get(scene, brush) * (BKE_brush_use_size_pressure(scene, brush) ? pressure : 1.0f);
const float brush_alpha_value = BKE_brush_alpha_get(scene, brush);
const float brush_alpha_pressure = brush_alpha_value * (BKE_brush_use_alpha_pressure(scene, brush) ? pressure : 1.0f);
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
spelling cleanup
2012-03-18 07:38:51 +00:00
/* intentionally don't initialize as NULL, make sure we initialize all members below */
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
WeightPaintInfo wpi;
Bugfix #20173: Crash with Weight Paint on polygons with no faces
2009-12-20 10:50:40 +00:00
/* cannot paint if there is no stroke data */
if (wpd == NULL) {
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* XXX: force a redraw here, since even though we can't paint,
* at least view won't freeze until stroke ends */
Bugfix #20173: Crash with Weight Paint on polygons with no faces
2009-12-20 10:50:40 +00:00
ED_region_tag_redraw(CTX_wm_region(C));
return;
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vc = &wpd->vc;
ob = vc->obact;
me = ob->data;
indexar = wpd->indexar;
Bugfix #20173: Crash with Weight Paint on polygons with no faces
2009-12-20 10:50:40 +00:00
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
view3d_operator_needs_opengl(C);
Bugfix #20173: Crash with Weight Paint on polygons with no faces
2009-12-20 10:50:40 +00:00
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
/* load projection matrix */
Math lib: matrix multiplication order fix for two functions that were inconsistent with similar functions & math notation: mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B) mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B) For branch maintainers, it should be relatively simple to fix things manually, it's also possible run this script after merging to do automatic replacement: http://www.pasteall.org/27459/python
2011-12-16 19:53:12 +00:00
mult_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat);
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
RNA_float_get_array(itemptr, "mouse", mval);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
mval[0] -= vc->ar->winrct.xmin;
mval[1] -= vc->ar->winrct.ymin;
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
code cleanup: move get_selected_defgroups into object_deform.c and make it behave like similar functions, also when drawing vertex weight colors, only call this function when multi-paint is enabled.
2012-09-05 03:45:32 +00:00
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
/* *** setup WeightPaintInfo - pass onto do_weight_paint_vertex *** */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
wpi.defbase_tot = wpd->defbase_tot;
code cleanup: move get_selected_defgroups into object_deform.c and make it behave like similar functions, also when drawing vertex weight colors, only call this function when multi-paint is enabled.
2012-09-05 03:45:32 +00:00
wpi.defbase_sel = BKE_objdef_selected_get(ob, wpi.defbase_tot, &wpi.defbase_tot_sel);
if (wpi.defbase_tot_sel == 0 && ob->actdef > 0) {
wpi.defbase_tot_sel = 1;
}
minor changes, fix coming next (no functional edits).
2011-12-09 06:05:58 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
wpi.defbase_tot_unsel = wpi.defbase_tot - wpi.defbase_tot_sel;
wpi.vgroup_active = wpd->vgroup_active;
wpi.vgroup_mirror = wpd->vgroup_mirror;
wpi.lock_flags = wpd->lock_flags;
wpi.vgroup_validmap = wpd->vgroup_validmap;
wpi.do_flip = RNA_boolean_get(itemptr, "pen_flip");
wpi.do_multipaint = (ts->multipaint != 0);
wpi.do_auto_normalize = ((ts->auto_normalize != 0) && (wpi.vgroup_validmap != NULL));
wpi.brush_alpha_value = brush_alpha_value;
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
/* *** done setting up WeightPaintInfo *** */
Math Lib * Convert all code to use new functions. * Branch maintainers may want to skip this commit, and run this conversion script instead, if they use a lot of math functions in new code: http://www.pasteall.org/9052/python
2009-11-10 20:43:45 +00:00
swap_m4m4(wpd->vc.rv3d->persmat, mat);
fix for a bug painting on selected verts, also fix an error in my own recent commit.
2011-09-14 12:44:21 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
use_vert_sel = (me->editflag & ME_EDIT_VERT_SEL) != 0;
fix for a bug painting on selected verts, also fix an error in my own recent commit.
2011-09-14 12:44:21 +00:00
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
/* which faces are involved */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (wp->flag & VP_AREA) {
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
/* Ugly hack, to avoid drawing vertex index when getting the face index buffer - campbell */
fix for a bug painting on selected verts, also fix an error in my own recent commit.
2011-09-14 12:44:21 +00:00
me->editflag &= ~ME_EDIT_VERT_SEL;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
totindex = sample_backbuf_area(vc, indexar, me->totpoly, mval[0], mval[1], brush_size_pressure);
fix for a bug painting on selected verts, also fix an error in my own recent commit.
2011-09-14 12:44:21 +00:00
me->editflag |= use_vert_sel ? ME_EDIT_VERT_SEL : 0;
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
}
else {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
indexar[0] = view3d_sample_backbuf(vc, mval[0], mval[1]);
if (indexar[0]) totindex = 1;
else totindex = 0;
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (wp->flag & VP_COLINDEX) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (index = 0; index < totindex; index++) {
if (indexar[index] && indexar[index] <= me->totpoly) {
MPoly *mpoly = ((MPoly *)me->mpoly) + (indexar[index] - 1);
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (mpoly->mat_nr != ob->actcol - 1) {
indexar[index] = 0;
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
}
* Removed tablet pressure sensitive number field widget scrubbing, wasn't that useful and I suspect it was the cause of a few bugs * Added tablet pressure support (size/strength) for weight paint and vertex paint * Added tablet eraser support for weight paint and vertex paint (inverts the effect of the current tool) * Removed the old 'soft' option, now weight paint and vertex paint use the influence curve * Made the default brush use a smooth influence curve, rather than sharp
2009-11-20 01:39:27 +00:00
}
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
}
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if ((me->editflag & ME_EDIT_PAINT_MASK) && me->mpoly) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (index = 0; index < totindex; index++) {
if (indexar[index] && indexar[index] <= me->totpoly) {
MPoly *mpoly = ((MPoly *)me->mpoly) + (indexar[index] - 1);
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if ((mpoly->flag & ME_FACE_SEL) == 0) {
indexar[index] = 0;
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
}
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
}
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
/* make sure each vertex gets treated only once */
/* and calculate filter weight */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
totw = 0.0f;
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
if (brush->vertexpaint_tool == PAINT_BLEND_BLUR)
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
paintweight = 0.0f;
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
else
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
paintweight = BKE_brush_weight_get(scene, brush);
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (index = 0; index < totindex; index++) {
if (indexar[index] && indexar[index] <= me->totpoly) {
MPoly *mpoly = me->mpoly + (indexar[index] - 1);
brought weight paint back.
2009-08-31 15:57:13 +00:00
MLoop *ml = me->mloop + mpoly->loopstart;
int i;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (use_vert_sel) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = 0; i < mpoly->totloop; i++, ml++) {
svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge
2011-09-22 16:09:27 +00:00
me->dvert[ml->v].flag = (me->mvert[ml->v].flag & SELECT);
}
- use a flag define for bDeformGroup->flag rather than setting TRUE/FALSE - rename RNA bDeformGroup.flag to "lock_weight"
2011-09-14 07:07:17 +00:00
}
else {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = 0; i < mpoly->totloop; i++, ml++) {
svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge
2011-09-22 16:09:27 +00:00
me->dvert[ml->v].flag = 1;
}
brought weight paint back.
2009-08-31 15:57:13 +00:00
}
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
if (brush->vertexpaint_tool == PAINT_BLEND_BLUR) {
fix for some pedantic warnings.
2010-12-03 01:52:28 +00:00
MDeformWeight *dw, *(*dw_func)(MDeformVert *, const int);
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (wp->flag & VP_ONLYVGROUP)
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dw_func = (MDeformWeight *(*)(MDeformVert *, const int))defvert_find_index;
linking in mesh data with animation crashed blender. also fixed some warnings.
2010-02-02 18:24:10 +00:00
else
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
dw_func = defvert_verify_index;
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
brought weight paint back.
2009-08-31 15:57:13 +00:00
ml = me->mloop + mpoly->loopstart;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = 0; i < mpoly->totloop; i++, ml++) {
unsigned int vidx = ml->v;
const float fac = calc_vp_strength_dl(wp, vc, wpd->vertexcosnos + 6 * vidx, mval, brush_size_pressure);
improvement to how weight paint blur works * the accumulated blur weight now takes into account how far verts are from the brush, giving more even results * verts where the weight wasnt found were being ignored, now treat them as zero weight verts.
2011-12-30 04:38:45 +00:00
if (fac > 0.0f) {
fix errors in bmesh vertex paint - was swapping matrix incorrectly, would fail when the object had any transform - wasn't calling mesh_update_customdata_pointers() when adding MCol's in some cases - was calling do_shared_vertexcol() twice when it didnt need to (blur painting only)
2012-01-18 08:43:27 +00:00
dw = dw_func(&me->dvert[vidx], wpi.vgroup_active);
improvement to how weight paint blur works * the accumulated blur weight now takes into account how far verts are from the brush, giving more even results * verts where the weight wasnt found were being ignored, now treat them as zero weight verts.
2011-12-30 04:38:45 +00:00
paintweight += dw ? (dw->weight * fac) : 0.0f;
totw += fac;
svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge
2011-09-22 16:09:27 +00:00
}
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
}
}
}
}
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
if (brush->vertexpaint_tool == PAINT_BLEND_BLUR) {
improvement to how weight paint blur works * the accumulated blur weight now takes into account how far verts are from the brush, giving more even results * verts where the weight wasnt found were being ignored, now treat them as zero weight verts.
2011-12-30 04:38:45 +00:00
paintweight /= totw;
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (index = 0; index < totindex; index++) {
fix errors in bmesh vertex paint - was swapping matrix incorrectly, would fail when the object had any transform - wasn't calling mesh_update_customdata_pointers() when adding MCol's in some cases - was calling do_shared_vertexcol() twice when it didnt need to (blur painting only)
2012-01-18 08:43:27 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (indexar[index] && indexar[index] <= me->totpoly) {
MPoly *mpoly = me->mpoly + (indexar[index] - 1);
MLoop *ml = me->mloop + mpoly->loopstart;
brought weight paint back.
2009-08-31 15:57:13 +00:00
int i;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = 0; i < mpoly->totloop; i++, ml++) {
unsigned int vidx = ml->v;
fix errors in bmesh vertex paint - was swapping matrix incorrectly, would fail when the object had any transform - wasn't calling mesh_update_customdata_pointers() when adding MCol's in some cases - was calling do_shared_vertexcol() twice when it didnt need to (blur painting only)
2012-01-18 08:43:27 +00:00
svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge
2011-09-22 16:09:27 +00:00
if (me->dvert[vidx].flag) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
alpha = calc_vp_alpha_dl(wp, vc, wpd->wpimat, wpd->vertexcosnos + 6 * vidx,
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
mval, brush_size_pressure, brush_alpha_pressure);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (alpha) {
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
do_weight_paint_vertex(wp, ob, &wpi, vidx, alpha, paintweight);
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
me->dvert[vidx].flag = 0;
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
}
}
}
}
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
/* *** free wpi members */
minor changes, fix coming next (no functional edits).
2011-12-09 06:05:58 +00:00
MEM_freeN((void *)wpi.defbase_sel);
spelling cleanup
2012-03-18 07:38:51 +00:00
/* *** don't freeing wpi members */
refactor wpaint_stroke_update_step not to call expensive functions per-vertex and move args passed to do_weight_paint_vertex into WeightPaintInfo structure since there were far too many args to this function.
2011-09-19 04:53:11 +00:00
Math Lib * Convert all code to use new functions. * Branch maintainers may want to skip this commit, and run this conversion script instead, if they use a lot of math functions in new code: http://www.pasteall.org/9052/python
2009-11-10 20:43:45 +00:00
swap_m4m4(vc->rv3d->persmat, mat);
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
DAG_id_tag_update was being called with non object ID's and OB_RECALC_* flags which only apply to objects. harmless but misleading.
2011-01-03 12:41:16 +00:00
DAG_id_tag_update(ob->data, 0);
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
ED_region_tag_redraw(vc->ar);
}
Patch [#30965] Cancel Sculpt Stroke w/ ESCAPE If the RMB has not been released after starting a sculpt stroke, then hitting escape will cancel the stroke in progress and undo any changes to the mesh. This is a slightly faster work-flow than using undo, is a feature available in other paint programs, and also puts in place the infrastructure to add other keys later that could tweak strokes in different ways.
2012-05-03 04:11:53 +00:00
static void wpaint_stroke_done(const bContext *C, struct PaintStroke *stroke)
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
ToolSettings *ts = CTX_data_tool_settings(C);
Object *ob = CTX_data_active_object(C);
struct WPaintData *wpd = paint_stroke_mode_data(stroke);
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (wpd) {
if (wpd->vertexcosnos)
Bugfix #20173: Crash with Weight Paint on polygons with no faces
2009-12-20 10:50:40 +00:00
MEM_freeN(wpd->vertexcosnos);
MEM_freeN(wpd->indexar);
if (wpd->vgroup_validmap)
minor changes, fix coming next (no functional edits).
2011-12-09 06:05:58 +00:00
MEM_freeN((void *)wpd->vgroup_validmap);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (wpd->lock_flags)
minor changes, fix coming next (no functional edits).
2011-12-09 06:05:58 +00:00
MEM_freeN((void *)wpd->lock_flags);
vgroup_validmap needed to be assigned when locks were active.
2011-09-19 15:11:01 +00:00
Bugfix #20173: Crash with Weight Paint on polygons with no faces
2009-12-20 10:50:40 +00:00
MEM_freeN(wpd);
}
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
/* frees prev buffer */
copy_wpaint_prev(ts->wpaint, NULL, 0);
/* and particles too */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob->particlesystem.first) {
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
ParticleSystem *psys;
int i;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (psys = ob->particlesystem.first; psys; psys = psys->next) {
for (i = 0; i < PSYS_TOT_VG; i++) {
if (psys->vgroup[i] == ob->actdef) {
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
psys->recalc |= PSYS_RECALC_RESET;
break;
}
}
}
}
DAG_id_tag_update was being called with non object ID's and OB_RECALC_* flags which only apply to objects. harmless but misleading.
2011-01-03 12:41:16 +00:00
DAG_id_tag_update(ob->data, 0);
Fix #31559: second 3D viewport does not update when paiting vertex/weight Added notification at the end of weight/vertex paint stroke so all opened viewports would be updated (same was already done for sculpt mode).
2012-06-04 15:13:36 +00:00
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
}
static int wpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
Commit of the sculpt patch (#19672). Further development will be in this branch until we merge to trunk.
2009-10-27 19:53:34 +00:00
op->customdata = paint_stroke_new(C, NULL, wpaint_stroke_test_start,
possible/partial fix for [#29521], in many places the deform group index was not checked which could crash blender.
2011-12-09 07:18:04 +00:00
wpaint_stroke_update_step,
wpaint_stroke_done, event->type);
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* add modal handler */
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
WM_event_add_modal_handler(C, op);
2.5 Paint: * Added airbrush and airbrush rate options to paint stroke. Works for sculpt, vertex paint, and weight paint.
2009-08-21 00:46:36 +00:00
op->type->modal(C, op, event);
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
return OPERATOR_RUNNING_MODAL;
}
Added cancel callbacks to modal operators which allocates memory in invoke callback. This prevents unfreed memory blocks when quiting Bledner with modal operator running.
2011-06-06 11:04:54 +00:00
static int wpaint_cancel(bContext *C, wmOperator *op)
{
paint_stroke_cancel(C, op);
return OPERATOR_CANCELLED;
}
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
void PAINT_OT_weight_paint(wmOperatorType *ot)
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Weight Paint";
ot->idname = "PAINT_OT_weight_paint";
Second part of fix for [#31157]: Some (actually, 172) operators have no tooltip. About 30 undocumented ops remaining...
2012-05-05 17:10:51 +00:00
ot->description = "Paint a stroke in the current vertex group's weights";
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->invoke = wpaint_invoke;
ot->modal = paint_stroke_modal;
/* ot->exec = vpaint_exec; <-- needs stroke property */
ot->poll = weight_paint_poll;
ot->cancel = wpaint_cancel;
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
2.5 Big commit, but mainly adminstration. - Enabled ot->flag OPTYPE_UNDO to work. - Removed all redundant ED_undo_pushes, but I'd recommend everyone to check it while testing. :) - Added view manipulations as OPTYPE_REGISTER, although this will flood the redo stack a bit... Nevertheless; for a "redo last action" panel we can simply check if both flags are set for redo. - Bugfix in editmode undo: selectmode was cleared, so you couldn't select after undo - Bugfix in mixing tweaks and keymaps... solution works but is weak, need to think over a while.
2009-01-31 19:40:40 +00:00
/* flags */
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
2.5 weight paint: * Refactored weight paint to use the new stroke code, now does smooth stroke and stroke spacing. Note: weight paint is failing to free it's MocNodes in 2.5, someone might want to look into that
2009-08-20 15:25:12 +00:00
RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", "");
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
}
tag UNUSED() for operator exec() and invoke() functions.
2010-10-15 01:36:14 +00:00
static int weight_paint_set_exec(bContext *C, wmOperator *UNUSED(op))
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
struct Scene *scene = CTX_data_scene(C);
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
Object *obact = CTX_data_active_object(C);
Fix wrong unified weight paint value version patch, was doing incorrect version check. Fix #31209: weight paint sample & fill not using correct brush/unified value.
2012-05-02 16:05:25 +00:00
ToolSettings *ts = CTX_data_tool_settings(C);
Brush *brush = paint_brush(&ts->wpaint->paint);
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
float vgroup_weight = BKE_brush_weight_get(scene, brush);
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
Fix wrong unified weight paint value version patch, was doing incorrect version check. Fix #31209: weight paint sample & fill not using correct brush/unified value.
2012-05-02 16:05:25 +00:00
wpaint_fill(scene->toolsettings->wpaint, obact, vgroup_weight);
remove unused arg & some style edits on radish merge, also reverted odd change that somehow got in to cmake preset.
2011-09-19 16:41:29 +00:00
ED_region_tag_redraw(CTX_wm_region(C)); /* XXX - should redraw all 3D views */
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
return OPERATOR_FINISHED;
}
void PAINT_OT_weight_set(wmOperatorType *ot)
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Set Weight";
ot->idname = "PAINT_OT_weight_set";
Second part of fix for [#31157]: Some (actually, 172) operators have no tooltip. About 30 undocumented ops remaining...
2012-05-05 17:10:51 +00:00
ot->description = "Fill the active vertex group with the current paint weight";
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = weight_paint_set_exec;
ot->poll = mask_paint_poll; /* it was facemask_paint_poll */
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
/* flags */
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
}
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
/* ************ set / clear vertex paint mode ********** */
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
static int set_vpaint(bContext *C, wmOperator *op) /* toggle */
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Object *ob = CTX_data_active_object(C);
Scene *scene = CTX_data_scene(C);
VPaint *vp = scene->toolsettings->vpaint;
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
Mesh *me;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
me = BKE_mesh_from_object(ob);
2.5 *** Proof of concept! **** 3D window Panels back, in own designated region for now. Activate or hide it with Nkey. Note that Background Image doesn't work yet, Transform Orientations probably need tests by Martin, Sculpt options have to be recoded there by Nicholas. The UI design sessions will of course review all of this! We'll have to solve a lot of related topics; - navigation (where) and context (what) - non-overlapping layouts vs floating panels/bars - properties vs tools (toolbars) - drop panels and make nice (semi-automated) list views? I've also done experiments with making the main 3d view stay 'behind' the buttons region. That makes popping buttons in and out less distracting, but also makes it obscuring the view... it's not in this commit, it didn't work proper :) To get that work it has to be handled by the internal compositor, then it even can have fancy transparency in back. Anyhoo, time enough to play with this a while. Especially for Image window (paint) it can work well too.
2009-02-10 15:38:00 +00:00
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
if (me == NULL || BKE_object_obdata_is_libdata(ob)) {
2.5/Vertex paint: * Made vertex paint local to object, like sculpt mode. * New test for vertex paint is (ob->mode & OB_MODE_VERTEX_PAINT)
2009-08-15 20:36:15 +00:00
ob->mode &= ~OB_MODE_VERTEX_PAINT;
2.5 Outliner: brought back to near full functioning: - proper operators, like for open/close items, exec operations (note: select is still same operator as activate, should become modal ops later) - rename works again (ctrl+click) - proper notifiers for redraws - select / extend select works again - editmode in/out works again - enter key opens/closes again - right mouse operations work again Didn't do: - options for Sequence strips - signals to change button views on clicks - error/warning messages UI: - added new uiButSetRenameFunc(), which passes on the old name - added uiButActiveOnly(), which ensures a button gets created in active state, and gets removed when used. Needed for editing names in outliner. Andrea: check outliner.c for uiButActiveOnly(), very easy to use! Also: - Added posemode operator, CTRL+TAB tied to it.
2009-07-25 13:40:59 +00:00
return OPERATOR_PASS_THROUGH;
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (me && me->mloopcol == NULL) {
make_vertexcol(ob);
}
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
/* toggle: end vpaint */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (ob->mode & OB_MODE_VERTEX_PAINT) {
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
2.5/Vertex paint: * Made vertex paint local to object, like sculpt mode. * New test for vertex paint is (ob->mode & OB_MODE_VERTEX_PAINT)
2009-08-15 20:36:15 +00:00
ob->mode &= ~OB_MODE_VERTEX_PAINT;
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
}
else {
2.5/Vertex paint: * Made vertex paint local to object, like sculpt mode. * New test for vertex paint is (ob->mode & OB_MODE_VERTEX_PAINT)
2009-08-15 20:36:15 +00:00
ob->mode |= OB_MODE_VERTEX_PAINT;
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
/* Turn off weight painting */
2.5/Paint: * Weightpaint is now object-local like sculpt and vertexpaint. * Fixed a bug spotted by DingTo, going from editmode to sculptmode didn't fully leave editmode
2009-08-15 21:46:25 +00:00
if (ob->mode & OB_MODE_WEIGHT_PAINT)
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
set_wpaint(C, op);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (vp == NULL)
vp = scene->toolsettings->vpaint = new_vpaint(0);
2.5 - Weightpaint back (CTRL+TAB or menu) Also weightpaint is sortof non-modal, allowing to use all existing hotkeys while in paint mode. Only leftmouse is overridden. - Made vpaint and wpaint entirely local, stored in scene (and saved!) - Small bugfix (also in 2.48): on weightpaint mode, all armature objects in 3d window were drawing as active poses. Now only the armature deformer is. Nice point for the UI agenda: are paint modes on ACTION mouse? Only then you can combine it with SELECT mouse...
2009-01-10 14:19:14 +00:00
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
paint_cursor_start(C, vertex_paint_poll);
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
mask now draws in the image view, misc minor edits.
2012-07-25 13:44:59 +00:00
BKE_paint_init(&vp->paint, PAINT_CURSOR_VERTEX_PAINT);
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
}
if (me)
/* update modifier stack for mapping requirements */
DAG_id_tag_update was being called with non object ID's and OB_RECALC_* flags which only apply to objects. harmless but misleading.
2011-01-03 12:41:16 +00:00
DAG_id_tag_update(&me->id, 0);
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
WM_event_add_notifier(C, NC_SCENE | ND_MODE, scene);
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
return OPERATOR_FINISHED;
}
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
void PAINT_OT_vertex_paint_toggle(wmOperatorType *ot)
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Vertex Paint Mode";
ot->idname = "PAINT_OT_vertex_paint_toggle";
Second part of fix for [#31157]: Some (actually, 172) operators have no tooltip. About 30 undocumented ops remaining...
2012-05-05 17:10:51 +00:00
ot->description = "Toggle the vertex paint mode in 3D view";
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = set_vpaint;
ot->poll = paint_poll_test;
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
2.5 Big commit, but mainly adminstration. - Enabled ot->flag OPTYPE_UNDO to work. - Removed all redundant ED_undo_pushes, but I'd recommend everyone to check it while testing. :) - Added view manipulations as OPTYPE_REGISTER, although this will flood the redo stack a bit... Nevertheless; for a "redo last action" panel we can simply check if both flags are set for redo. - Bugfix in editmode undo: selectmode was cleared, so you couldn't select after undo - Bugfix in mixing tweaks and keymaps... solution works but is weak, need to think over a while.
2009-01-31 19:40:40 +00:00
/* flags */
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
/* ********************** vertex paint operator ******************* */
/* Implementation notes:
style cleanup - use aligned * prefixed blocks for descriptive comments (was already used a lot and part of proposed style guide).
2012-03-03 16:31:46 +00:00
*
* Operator->invoke()
* - validate context (add mcol)
* - create customdata storage
* - call paint once (mouse click)
* - add modal handler
*
* Operator->modal()
* - for every mousemove, apply vertex paint
* - exit on mouse release, free customdata
* (return OPERATOR_FINISHED also removes handler and operator)
*
* For future:
* - implement a stroke event (or mousemove with past positons)
* - revise whether op->customdata should be added in object, in set_vpaint
*/
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
style cleanup: use capital camel case names for typedef's
2012-06-10 15:20:10 +00:00
typedef struct PolyFaceMap {
struct PolyFaceMap *next, *prev;
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
int facenr;
style cleanup: use capital camel case names for typedef's
2012-06-10 15:20:10 +00:00
} PolyFaceMap;
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
typedef struct VPaintData {
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
ViewContext vc;
unsigned int paintcol;
int *indexar;
float *vertexcosnos;
float vpimat[3][3];
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
/* modify 'me->mcol' directly, since the derived mesh is drawing from this array,
* otherwise we need to refresh the modifier stack */
int use_fast_update;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
/* mpoly -> mface mapping */
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
MemArena *polyfacemap_arena;
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
ListBase *polyfacemap;
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
} VPaintData;
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
svn merge -r41751:41779 ^/trunk/blender
2011-11-15 02:05:32 +00:00
static void vpaint_build_poly_facemap(struct VPaintData *vd, Mesh *me)
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
{
MFace *mf;
style cleanup: use capital camel case names for typedef's
2012-06-10 15:20:10 +00:00
PolyFaceMap *e;
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
int *origIndex;
int i;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vd->polyfacemap_arena = BLI_memarena_new(1 << 13, "vpaint tmp");
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
BLI_memarena_use_calloc(vd->polyfacemap_arena);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vd->polyfacemap = BLI_memarena_alloc(vd->polyfacemap_arena, sizeof(ListBase) * me->totpoly);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
Add CD_POLYINDEX layer to reduce need for retesselations
2011-11-13 15:13:59 +00:00
origIndex = CustomData_get_layer(&me->fdata, CD_POLYINDEX);
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
mf = me->mface;
if (!origIndex)
return;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = 0; i < me->totface; i++, mf++, origIndex++) {
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
if (*origIndex == ORIGINDEX_NONE)
continue;
style cleanup: use capital camel case names for typedef's
2012-06-10 15:20:10 +00:00
e = BLI_memarena_alloc(vd->polyfacemap_arena, sizeof(PolyFaceMap));
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
e->facenr = i;
BLI_addtail(&vd->polyfacemap[*origIndex], e);
}
}
Add input sample averaging to PaintStroke. Averages input samples to make the brush stroke smoother. Only mouse location is averaged right now, not pressure/tilt/etc. The DNA is in struct Paint.num_input_samples, RNA is Paint.input_samples. In combination with PaintStroke usage this change applies to sculpt, vpaint, and wpaint. The range of useful values varies quite a bit depending on input device; mouse needs higher values to match tablet pen, so set max samples pretty high (64). Release note section: http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Sculpting#Input_Stroke_Averaging
2012-05-21 23:32:46 +00:00
static int vpaint_stroke_test_start(bContext *C, struct wmOperator *op, const float UNUSED(mouse[2]))
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
ToolSettings *ts = CTX_data_tool_settings(C);
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
struct PaintStroke *stroke = op->customdata;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
VPaint *vp = ts->vpaint;
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
struct VPaintData *vpd;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Object *ob = CTX_data_active_object(C);
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
Mesh *me;
float mat[4][4], imat[4][4];
/* context checks could be a poll() */
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
me = BKE_mesh_from_object(ob);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (me == NULL || me->totpoly == 0)
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
return OPERATOR_PASS_THROUGH;
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (me->mloopcol == NULL)
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
make_vertexcol(ob);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (me->mloopcol == NULL)
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
return OPERATOR_CANCELLED;
=BMesh: Super Knife Tool Alpha= Implemented a new "super knife". Activate with k. Holding CTRL will allow extended cutting ala old lines mode. Confirm with enter and escape. You cannot cancel, btw, you can only confirm (and undo later if you want). Hopefully I'll support undo within the tool soon. * Supports cutting edges, into faces, etc. You can pretty much do whatever you want. Will snap to vertices too. * Note that if you cut into a face, it must be valid topologically when you press enter to confirm. * It's pretty and graphical :) * You can only cut visible geometry. * UVs/vcols are a little buggy still Now, thou shalt all cease and desist all lack of motivation for testing! No longer shall users put off testing until "it's cooler"! :P
2010-09-25 01:54:58 +00:00
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
/* make mode data storage */
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vpd = MEM_callocN(sizeof(struct VPaintData), "VPaintData");
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
paint_stroke_set_mode_data(stroke, vpd);
view3d_set_viewcontext(C, &vpd->vc);
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
vpd->vertexcosnos = mesh_get_mapped_verts_nors(vpd->vc.scene, ob);
vpd->indexar = get_indexarray(me);
vpd->paintcol = vpaint_get_current_col(vp);
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
/* are we painting onto a modified mesh?,
* if not we can skip face map trickyness */
if (vertex_paint_use_fast_update_check(ob)) {
vpaint_build_poly_facemap(vpd, me);
vpd->use_fast_update = TRUE;
}
else {
vpd->use_fast_update = FALSE;
}
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
/* for filtering */
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
copy_vpaint_prev(vp, (unsigned int *)me->mloopcol, me->totloop);
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
/* some old cruft to sort out later */
Math lib: matrix multiplication order fix for two functions that were inconsistent with similar functions & math notation: mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B) mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B) For branch maintainers, it should be relatively simple to fix things manually, it's also possible run this script after merging to do automatic replacement: http://www.pasteall.org/27459/python
2011-12-16 19:53:12 +00:00
mult_m4_m4m4(mat, vpd->vc.rv3d->viewmat, ob->obmat);
Math Lib * Convert all code to use new functions. * Branch maintainers may want to skip this commit, and run this conversion script instead, if they use a lot of math functions in new code: http://www.pasteall.org/9052/python
2009-11-10 20:43:45 +00:00
invert_m4_m4(imat, mat);
copy_m3_m4(vpd->vpimat, imat);
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
return 1;
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
}
ok, apparently didn't commit this either. apparently includes a merge with trunk/2.5 at r24811 I thought I'd committed but did not, yeek.
2009-11-29 00:53:23 +00:00
#if 0
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.
2011-12-30 05:16:28 +00:00
static void vpaint_paint_face(VPaint *vp, VPaintData *vpd, Object *ob,
const unsigned int index, const float mval[2],
vertex/weight paint - store brush_alpha() result so it doesnt need to be called for each vertex when paitning. - use _pressure suffix rather then _final to show the pressure has been applied. - weight paint was needlessly calculateing the test weight when multipaint was enabled.
2012-01-15 07:15:15 +00:00
const float brush_size_pressure, const float brush_alpha_pressure,
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.
2011-12-30 05:16:28 +00:00
int UNUSED(flip))
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
{
ViewContext *vc = &vpd->vc;
Moved the image paint tool and the vertex/weight paint tool (blend mode?) to the Brush data. This now works the same way as sculpt, with named preset brushes that retain settings.
2010-01-20 08:30:40 +00:00
Brush *brush = paint_brush(&vp->paint);
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
Mesh *me = BKE_mesh_from_object(ob);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
MFace *mface = &me->mface[index];
unsigned int *mcol = ((unsigned int *)me->mcol) + 4 * index;
unsigned int *mcolorig = ((unsigned int *)vp->vpaint_prev) + 4 * index;
* Removed tablet pressure sensitive number field widget scrubbing, wasn't that useful and I suspect it was the cause of a few bugs * Added tablet pressure support (size/strength) for weight paint and vertex paint * Added tablet eraser support for weight paint and vertex paint (inverts the effect of the current tool) * Removed the old 'soft' option, now weight paint and vertex paint use the influence curve * Made the default brush use a smooth influence curve, rather than sharp
2009-11-20 01:39:27 +00:00
float alpha;
int i;
vertex/weight paint - store brush_alpha() result so it doesnt need to be called for each vertex when paitning. - use _pressure suffix rather then _final to show the pressure has been applied. - weight paint was needlessly calculateing the test weight when multipaint was enabled.
2012-01-15 07:15:15 +00:00
int brush_alpha_pressure_i;
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if ((vp->flag & VP_COLINDEX && mface->mat_nr != ob->actcol - 1) ||
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
((me->editflag & ME_EDIT_PAINT_MASK) && !(mface->flag & ME_FACE_SEL)))
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
return;
minor cleanup to weightpaint code, move color & weight blending into own function (was duplicated), also add enum for vpaint blend modes.
2012-01-15 06:29:08 +00:00
if (brush->vertexpaint_tool == PAINT_BLEND_BLUR) {
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
unsigned int fcol1 = mcol_blend(mcol[0], mcol[1], 128);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (mface->v4) {
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
unsigned int fcol2 = mcol_blend(mcol[2], mcol[3], 128);
vpd->paintcol = mcol_blend(fcol1, fcol2, 128);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
}
else {
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
vpd->paintcol = mcol_blend(mcol[2], fcol1, 170);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
}
}
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
brush_alpha_pressure_i = (int)(brush_alpha_pressure * 255.0f);
vertex/weight paint - store brush_alpha() result so it doesnt need to be called for each vertex when paitning. - use _pressure suffix rather then _final to show the pressure has been applied. - weight paint was needlessly calculateing the test weight when multipaint was enabled.
2012-01-15 07:15:15 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
for (i = 0; i < (mface->v4 ? 4 : 3); ++i) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
alpha = calc_vp_alpha_dl(vp, vc, vpd->vpimat, vpd->vertexcosnos + 6 * (&mface->v1)[i],
vertex/weight paint - store brush_alpha() result so it doesnt need to be called for each vertex when paitning. - use _pressure suffix rather then _final to show the pressure has been applied. - weight paint was needlessly calculateing the test weight when multipaint was enabled.
2012-01-15 07:15:15 +00:00
mval, brush_size_pressure, brush_alpha_pressure);
if (alpha) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
const int alpha_i = (int)(alpha * 255.0f);
modify the weight paint and vcol functions not to modify the color in place and instead return a new color. also fix for error in last commit, the brushes alpha wasnt set for weight paint info struct.
2012-01-15 07:46:59 +00:00
mcol[i] = vpaint_blend(vp, mcol[i], mcolorig[i], vpd->paintcol, alpha_i, brush_alpha_pressure_i);
weight paint - fix for own error in r42986, also avoid getting unified settings for each weight.
2011-12-30 05:16:28 +00:00
}
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
}
}
ok, apparently didn't commit this either. apparently includes a merge with trunk/2.5 at r24811 I thought I'd committed but did not, yeek.
2009-11-29 00:53:23 +00:00
#endif
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
/* BMESH version of vpaint_paint_face (commented above) */
static void vpaint_paint_poly(VPaint *vp, VPaintData *vpd, Object *ob,
const unsigned int index, const float mval[2],
code cleanup: remove bmesh todo, which infact is working fine.
2012-04-16 10:02:52 +00:00
const float brush_size_pressure, const float brush_alpha_pressure)
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
{
ViewContext *vc = &vpd->vc;
Brush *brush = paint_brush(&vp->paint);
code cleanup: naming - pose/armature/image also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
Mesh *me = BKE_mesh_from_object(ob);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
MPoly *mpoly = &me->mpoly[index];
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
MFace *mf;
MCol *mc;
MLoop *ml;
MLoopCol *mlc;
style cleanup: use capital camel case names for typedef's
2012-06-10 15:20:10 +00:00
PolyFaceMap *e;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
unsigned int *lcol = ((unsigned int *)me->mloopcol) + mpoly->loopstart;
unsigned int *lcolorig = ((unsigned int *)vp->vpaint_prev) + mpoly->loopstart;
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
float alpha;
int i, j;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
int brush_alpha_pressure_i = (int)(brush_alpha_pressure * 255.0f);
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (brush->vertexpaint_tool == PAINT_BLEND_BLUR) {
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
unsigned int blend[4] = {0};
unsigned int tcol;
char *col;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (j = 0; j < mpoly->totloop; j++) {
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
col = (char *)(lcol + j);
blend[0] += col[0];
blend[1] += col[1];
blend[2] += col[2];
blend[3] += col[3];
}
blend[0] /= mpoly->totloop;
blend[1] /= mpoly->totloop;
blend[2] /= mpoly->totloop;
blend[3] /= mpoly->totloop;
col = (char *)&tcol;
col[0] = blend[0];
col[1] = blend[1];
col[2] = blend[2];
col[3] = blend[3];
vpd->paintcol = *((unsigned int *)col);
}
ml = me->mloop + mpoly->loopstart;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (i = 0; i < mpoly->totloop; i++, ml++) {
alpha = calc_vp_alpha_dl(vp, vc, vpd->vpimat,
vpd->vertexcosnos + 6 * ml->v, mval,
brush_size_pressure, brush_alpha_pressure);
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (alpha > 0.0f) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
const int alpha_i = (int)(alpha * 255.0f);
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
lcol[i] = vpaint_blend(vp, lcol[i], lcolorig[i], vpd->paintcol, alpha_i, brush_alpha_pressure_i);
}
}
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
if (vpd->use_fast_update) {
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
#ifdef CPYCOL
# undef CPYCOL
#endif
#define CPYCOL(c, l) (c)->a = (l)->a, (c)->r = (l)->r, (c)->g = (l)->g, (c)->b = (l)->b
style cleanup - spelling - turns out we had tessellation spelt wrong all over. - use \directive for doxy (not @directive) - remove BLI_sparsemap.h - was from bmesh merge IIRC but entire file commented and not used.
2012-03-02 16:05:54 +00:00
/* update vertex colors for tessellations incrementally,
* rather then regenerating the tessellation altogether */
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
for (e = vpd->polyfacemap[index].first; e; e = e->next) {
mf = me->mface + e->facenr;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
mc = me->mcol + e->facenr * 4;
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
ml = me->mloop + mpoly->loopstart;
mlc = me->mloopcol + mpoly->loopstart;
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (j = 0; j < mpoly->totloop; j++, ml++, mlc++) {
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
if (ml->v == mf->v1)
CPYCOL(mc, mlc);
else if (ml->v == mf->v2)
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
CPYCOL(mc + 1, mlc);
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
else if (ml->v == mf->v3)
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
CPYCOL(mc + 2, mlc);
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
else if (mf->v4 && ml->v == mf->v4)
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
CPYCOL(mc + 3, mlc);
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
}
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
}
#undef CPYCOL
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
}
move bmesh painting code into its own function, trunk has vpaint_paint_face(), this adds vpaint_paint_poly() which does the same thing.
2012-01-15 10:48:39 +00:00
}
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
static void vpaint_stroke_update_step(bContext *C, struct PaintStroke *stroke, PointerRNA *itemptr)
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Scene *scene = CTX_data_scene(C);
ToolSettings *ts = CTX_data_tool_settings(C);
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
struct VPaintData *vpd = paint_stroke_mode_data(stroke);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
VPaint *vp = ts->vpaint;
2.5 Paint: * Converted vertex paint and weight paint to use the new Paint type
2009-08-17 02:49:31 +00:00
Brush *brush = paint_brush(&vp->paint);
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
ViewContext *vc = &vpd->vc;
Object *ob = vc->obact;
Mesh *me = ob->data;
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
float mat[4][4];
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
int *indexar = vpd->indexar;
code cleanup: remove bmesh todo, which infact is working fine.
2012-04-16 10:02:52 +00:00
int totindex, index;
get the brush size at before applying each brush step, saves unified brush settings lookups per vertex/face-corner. also use math functions for calc_vp_strength(), and project the vertices as floats rather then ints to get better accuracy, otherwise no functional changes.
2011-12-30 03:50:04 +00:00
float mval[2];
const float pressure = RNA_float_get(itemptr, "pressure");
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
const float brush_size_pressure = BKE_brush_size_get(scene, brush) * (BKE_brush_use_size_pressure(scene, brush) ? pressure : 1.0f);
const float brush_alpha_pressure = BKE_brush_alpha_get(scene, brush) * (BKE_brush_use_alpha_pressure(scene, brush) ? pressure : 1.0f);
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
RNA_float_get_array(itemptr, "mouse", mval);
quiet compiler warnings for BLI_array defines, split BLI_array_append into BLI_array_append / BLI_array_append_r, the latter returning the new array location.
2011-11-16 17:09:41 +00:00
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
view3d_operator_needs_opengl(C);
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
/* load projection matrix */
Math lib: matrix multiplication order fix for two functions that were inconsistent with similar functions & math notation: mul_m4_m4m4(R, B, A) => mult_m4_m4m4(R, A, B) mul_m3_m3m4(R, B, A) => mult_m3_m3m4(R, A, B) For branch maintainers, it should be relatively simple to fix things manually, it's also possible run this script after merging to do automatic replacement: http://www.pasteall.org/27459/python
2011-12-16 19:53:12 +00:00
mult_m4_m4m4(mat, vc->rv3d->persmat, ob->obmat);
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
mval[0] -= vc->ar->winrct.xmin;
mval[1] -= vc->ar->winrct.ymin;
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
/* which faces are involved */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (vp->flag & VP_AREA) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
totindex = sample_backbuf_area(vc, indexar, me->totpoly, mval[0], mval[1], brush_size_pressure);
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
}
else {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
indexar[0] = view3d_sample_backbuf(vc, mval[0], mval[1]);
if (indexar[0]) totindex = 1;
else totindex = 0;
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (vp->flag & VP_COLINDEX) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (index = 0; index < totindex; index++) {
if (indexar[index] && indexar[index] <= me->totpoly) {
MPoly *mpoly = ((MPoly *)me->mpoly) + (indexar[index] - 1);
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (mpoly->mat_nr != ob->actcol - 1) {
indexar[index] = 0;
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
svn merge ^/trunk/blender -r42973:42991
2011-12-30 09:23:06 +00:00
}
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
}
}
commit before doing some hefty shapekey change, will break compilation
2009-11-01 00:06:53 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if ((me->editflag & ME_EDIT_PAINT_MASK) && me->mpoly) {
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (index = 0; index < totindex; index++) {
if (indexar[index] && indexar[index] <= me->totpoly) {
MPoly *mpoly = ((MPoly *)me->mpoly) + (indexar[index] - 1);
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if ((mpoly->flag & ME_FACE_SEL) == 0)
indexar[index] = 0;
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
}
}
}
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
Math Lib * Convert all code to use new functions. * Branch maintainers may want to skip this commit, and run this conversion script instead, if they use a lot of math functions in new code: http://www.pasteall.org/9052/python
2009-11-10 20:43:45 +00:00
swap_m4m4(vc->rv3d->persmat, mat);
merge with 2.5/trunk at r23271
2009-09-16 17:43:09 +00:00
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
for (index = 0; index < totindex; index++) {
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
if (indexar[index] && indexar[index] <= me->totpoly) {
code cleanup: remove bmesh todo, which infact is working fine.
2012-04-16 10:02:52 +00:00
vpaint_paint_poly(vp, vpd, ob, indexar[index] - 1, mval, brush_size_pressure, brush_alpha_pressure);
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
}
}
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
did math lib conversion, equivilent to merge with trunk/2.5 at r24464
2009-11-23 14:41:22 +00:00
swap_m4m4(vc->rv3d->persmat, mat);
fix errors in bmesh vertex paint - was swapping matrix incorrectly, would fail when the object had any transform - wasn't calling mesh_update_customdata_pointers() when adding MCol's in some cases - was calling do_shared_vertexcol() twice when it didnt need to (blur painting only)
2012-01-18 08:43:27 +00:00
Fix for #29080: vertex paint mask doesn't work
2011-10-29 13:25:18 +00:00
/* was disabled because it is slow, but necessary for blur */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (brush->vertexpaint_tool == PAINT_BLEND_BLUR) {
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
int do_tessface = vpd->use_fast_update;
do_shared_vertexcol(me, do_tessface);
Fix for #29080: vertex paint mask doesn't work
2011-10-29 13:25:18 +00:00
}
part one of profiling/optimizing. made cddm not update tesselations itself in cddm_from_mesh. also made BMO_Test/Set/ClearFlag into macros, and tweaked the way normals are calculated.
2009-09-05 06:10:30 +00:00
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
ED_region_tag_redraw(vc->ar);
if (vpd->use_fast_update == FALSE) {
/* recalculate modifier stack to get new colors, slow,
* avoid this if we can! */
DAG_id_tag_update(ob->data, 0);
}
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
}
Patch [#30965] Cancel Sculpt Stroke w/ ESCAPE If the RMB has not been released after starting a sculpt stroke, then hitting escape will cancel the stroke in progress and undo any changes to the mesh. This is a slightly faster work-flow than using undo, is a feature available in other paint programs, and also puts in place the infrastructure to add other keys later that could tweak strokes in different ways.
2012-05-03 04:11:53 +00:00
static void vpaint_stroke_done(const bContext *C, struct PaintStroke *stroke)
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
ToolSettings *ts = CTX_data_tool_settings(C);
struct VPaintData *vpd = paint_stroke_mode_data(stroke);
Fix #31559: second 3D viewport does not update when paiting vertex/weight Added notification at the end of weight/vertex paint stroke so all opened viewports would be updated (same was already done for sculpt mode).
2012-06-04 15:13:36 +00:00
ViewContext *vc = &vpd->vc;
Object *ob = vc->obact;
2.5/Paint: * Some initial work on a new paint abstraction, PaintStroke. For now, most of the code just pulls out stroke-related stuff from sculpt mode, next step is to integrate the other paint modes to use this. It'll enable stuff like smooth stroke for all the paint modes with less code duplication.
2009-08-19 21:24:52 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:38:07 +00:00
if (vpd->vertexcosnos)
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
MEM_freeN(vpd->vertexcosnos);
MEM_freeN(vpd->indexar);
/* frees prev buffer */
copy_vpaint_prev(ts->vpaint, NULL, 0);
fix [#30101] Vertex colors disappear after leaving edit mode this commit makes vertex paint check if it needs to rebuild the modifier stack when painting. - when painting with no modifiers, do partial updates from polys to tessfaces while painting, skip re-tesselation. - when painting onto a modified mesh, dont bother adjusting tessface colors - since the modifier stack will do this anyway. both cases should be faster then before.
2012-02-08 11:52:44 +00:00
if (vpd->polyfacemap_arena) {
BLI_memarena_free(vpd->polyfacemap_arena);
}
vpaint works with the new face structures, yay, though it probably still has issues, needs more testing. also hopefully fixed subsurf crash everyone but me was getting, what I found should have caused crashes even for me, no idea why it did not. also got face flags to work with subsurf, and partially got materials, though theres still a problem there.
2009-08-30 21:30:07 +00:00
Fix #31559: second 3D viewport does not update when paiting vertex/weight Added notification at the end of weight/vertex paint stroke so all opened viewports would be updated (same was already done for sculpt mode).
2012-06-04 15:13:36 +00:00
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
MEM_freeN(vpd);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
static int vpaint_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
Commit of the sculpt patch (#19672). Further development will be in this branch until we merge to trunk.
2009-10-27 19:53:34 +00:00
op->customdata = paint_stroke_new(C, NULL, vpaint_stroke_test_start,
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
vpaint_stroke_update_step,
vpaint_stroke_done, event->type);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
/* add modal handler */
merge with trunk/2.5 at r23876 [[Split portion of a mixed commit.]]
2009-10-22 23:22:05 +00:00
WM_event_add_modal_handler(C, op);
2.5 Paint: * Added airbrush and airbrush rate options to paint stroke. Works for sculpt, vertex paint, and weight paint.
2009-08-21 00:46:36 +00:00
op->type->modal(C, op, event);
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
return OPERATOR_RUNNING_MODAL;
}
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
Added cancel callbacks to modal operators which allocates memory in invoke callback. This prevents unfreed memory blocks when quiting Bledner with modal operator running.
2011-06-06 11:04:54 +00:00
static int vpaint_cancel(bContext *C, wmOperator *op)
{
paint_stroke_cancel(C, op);
return OPERATOR_CANCELLED;
}
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
void PAINT_OT_vertex_paint(wmOperatorType *ot)
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
{
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Vertex Paint";
ot->idname = "PAINT_OT_vertex_paint";
Second part of fix for [#31157]: Some (actually, 172) operators have no tooltip. About 30 undocumented ops remaining...
2012-05-05 17:10:51 +00:00
ot->description = "Paint a stroke in the active vertex color layer";
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->invoke = vpaint_invoke;
ot->modal = paint_stroke_modal;
/* ot->exec = vpaint_exec; <-- needs stroke property */
ot->poll = vertex_paint_poll;
ot->cancel = vpaint_cancel;
2.5 Vertex Paint back! Added WM level "paint cursor" system, which manages a custom painting cursor for tools or modes. - Activate it with WM_paint_cursor_activate(). That function wants two callbacks, a poll(C) to check whether there's a cursor in given context and ARegion, and a draw(C, x, y) which gets called when appropriate. - While paintcursor is active, the WM handles necessary redrawing events for all regions, also to nicely clear the cursor on region exit. - WM_paint_cursor_activate returns a handle, which you have to use to end the paint cursor. This handle also means you can register as many custom cursors as you want. At the moment, vertex paint mode registers only a mousemove handler, all other events are still normally handled. This is stuff for the future todo.
2009-01-09 13:55:45 +00:00
2.5 Big commit, but mainly adminstration. - Enabled ot->flag OPTYPE_UNDO to work. - Removed all redundant ED_undo_pushes, but I'd recommend everyone to check it while testing. :) - Added view manipulations as OPTYPE_REGISTER, although this will flood the redo stack a bit... Nevertheless; for a "redo last action" panel we can simply check if both flags are set for redo. - Bugfix in editmode undo: selectmode was cleared, so you couldn't select after undo - Bugfix in mixing tweaks and keymaps... solution works but is weak, need to think over a while.
2009-01-31 19:40:40 +00:00
/* flags */
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO | OPTYPE_BLOCKING;
2.5/Paint: * Converted vertex paint to use the new stroke system. Now supports the same smooth stroke and stroke spacing as sculpt mode. * Refactored the paint cursor a bit, just sculpt for now but other modes soon. * A couple warning fixes
2009-08-20 05:13:07 +00:00
RNA_def_collection_runtime(ot->srna, "stroke", &RNA_OperatorStrokeElement, "Stroke", "");
2.5 Two more files, vpaint.c and editdeform.c No functionality working related to this yet, tomorrow! (Added editdeform.c in mesh after all, it's doing hardly no lattice stuff, and it seems out of place in anim_api)
2009-01-07 19:23:22 +00:00
}
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
/* ********************** weight from bones operator ******************* */
static int weight_from_bones_poll(bContext *C)
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Object *ob = CTX_data_active_object(C);
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
return (ob && (ob->mode & OB_MODE_WEIGHT_PAINT) && modifiers_isDeformedByArmature(ob));
}
static int weight_from_bones_exec(bContext *C, wmOperator *op)
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
Scene *scene = CTX_data_scene(C);
Object *ob = CTX_data_active_object(C);
Object *armob = modifiers_isDeformedByArmature(ob);
Mesh *me = ob->data;
int type = RNA_enum_get(op->ptr, "type");
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
[#24045] heat weight fails on specific geometry. The error for heat weighting was only being printed in the console, while the problem remains at least a warning is now given that there was a problem calculating the heat weight. also fixed a memory leak from the mesh octree not being freed after assigning vertex groups. (ModNode error)
2010-10-11 00:15:49 +00:00
create_vgroups_from_armature(op->reports, scene, ob, armob, type, (me->editflag & ME_EDIT_MIRROR_X));
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
DAG_id_tag_update was being called with non object ID's and OB_RECALC_* flags which only apply to objects. harmless but misleading.
2011-01-03 12:41:16 +00:00
DAG_id_tag_update(&me->id, 0);
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
WM_event_add_notifier(C, NC_GEOM | ND_DATA, me);
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
return OPERATOR_FINISHED;
}
void PAINT_OT_weight_from_bones(wmOperatorType *ot)
{
style cleanup: operator/whitespace
2012-03-24 11:27:52 +00:00
static EnumPropertyItem type_items[] = {
More spell checking.
2012-07-04 15:04:38 +00:00
{ARM_GROUPS_AUTO, "AUTOMATIC", 0, "Automatic", "Automatic weights from bones"},
More tooltip editing
2010-02-11 02:03:18 +00:00
{ARM_GROUPS_ENVELOPE, "ENVELOPES", 0, "From Envelopes", "Weights from envelopes with user defined radius"},
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
{0, NULL, 0, NULL, NULL}};
/* identifiers */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->name = "Weight from Bones";
ot->idname = "PAINT_OT_weight_from_bones";
Last part of fix for [#31157]: Some (actually, 172) operators have no tooltip. Only remaining undocumented one is IMAGE_OT_record_composite (not sure what it actually does, nor even whether it’s actually working or not...). Note that I didn’t bother with operators flagged as OPTYPE_INTERNAL!
2012-05-06 15:03:31 +00:00
ot->description = "Set the weights of the groups matching the attached armature's selected bones, "
"using the distance between the vertices and the bones";
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
/* api callbacks */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->exec = weight_from_bones_exec;
ot->invoke = WM_menu_invoke;
ot->poll = weight_from_bones_poll;
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
/* flags */
style cleanup: mainly whitespace around operators and indentation - paint/sculpt tools
2012-03-28 03:47:33 +00:00
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
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
/* properties */
style cleanup: spaces aroudn operators for operator definitions.
2012-03-22 07:26:09 +00:00
ot->prop = RNA_def_enum(ot->srna, "type", type_items, 0, "Type", "Method to use for assigning weights");
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
}
Copy Permalink