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
4c67b23c8dc55e2c0184a6449c8cb0301d4f28d5
blender-archive/source/blender/blenkernel/intern/brush.c

868 lines
22 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
/*
Patch from GSR that a) fixes a whole bunch of GPL/BL license blocks that were previously missed; and b) greatly increase my ohloh stats!
2008-04-16 22:40:48 +00:00
* ***** BEGIN GPL LICENSE BLOCK *****
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
*
* 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
Patch from GSR that a) fixes a whole bunch of GPL/BL license blocks that were previously missed; and b) greatly increase my ohloh stats!
2008-04-16 22:40:48 +00:00
* of the License, or (at your option) any later version.
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
correct fsf address
2010-02-12 13:34:04 +00:00
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +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.
*
Patch from GSR that a) fixes a whole bunch of GPL/BL license blocks that were previously missed; and b) greatly increase my ohloh stats!
2008-04-16 22:40:48 +00:00
* ***** END GPL LICENSE BLOCK *****
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
*/
doxygen: blender/blenkernel tagged.
2011-02-27 20:40:57 +00:00
/** \file blender/blenkernel/intern/brush.c
* \ingroup bke
*/
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
#include "MEM_guardedalloc.h"
#include "DNA_brush_types.h"
#include "DNA_scene_types.h"
Brush/Paint internal changes - remove brush array for each Paint struct, just use a single brush pointer. - removed rna function based template filtering. - filter brushes using a flag on the brush and the pointer poll function. - set the brushes using a new operator WM_OT_context_set_id(). TODO - remake startup.blend, currently brush groupings are lost. - rewrite WM_OT_context_set_id() to use rna introspection.
2010-08-04 12:18:07 +00:00
#include "DNA_object_types.h"
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +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
#include "BLI_math.h"
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
#include "BLI_blenlib.h"
- jitter for painting (image and projection painting, others can be added) - remove falloff setting now the curve is used. - bugfix for airbrush & tablet, with no movement it would assume 1.0 pressure. - rna, use the use_* prefix for brush options.
2009-09-18 11:25:52 +00:00
#include "BLI_rand.h"
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
#include "BKE_brush.h"
2.5 Instead of many commits, here 1! - Constraint edit code back - Removed XXX stubs for constraints (make parent follow path works) - Removed XXX stubs for armature (make parent deform, do center, etc works) - Found a bad uninitialized global Scene * in code, especially in kernel it wreaked havoc. - added missing include in blenkernel/brush.c - fixed Nicholas' fix for editmode subsurf crash (It needed to check for editmode)
2009-01-10 19:34:23 +00:00
#include "BKE_colortools.h"
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
#include "BKE_global.h"
Did some refactoring with brush and sculpt to make radial control easier to add to other modes.
2009-01-25 07:28:11 +00:00
#include "BKE_image.h"
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
#include "BKE_library.h"
#include "BKE_main.h"
2.5 Texture paint: * Converted to use Paint struct. Now all the brush modes are done. TODO: * Make the UI better
2009-08-17 04:40:59 +00:00
#include "BKE_paint.h"
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
#include "BKE_texture.h"
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
#include "BKE_icons.h"
support for registering operators using the same internal rna api as panels, menus, headers & render engines since there was a fair bit of duplicate functionality. will remove the old system and update scripts next.
2009-12-24 16:10:26 +00:00
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
#include "IMB_imbuf.h"
#include "IMB_imbuf_types.h"
#include "RE_render_ext.h" /* externtex */
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
static void brush_defaults(Brush *brush)
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
{
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
brush->blend = 0;
brush->flag = 0;
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
workaround [#24392] 2d Image paint editor: no clone/smear/soften tools etc the brush system matches the brush mode with the object mode, but this doesn't work for 2D image view paint. since the poll() function doesnt have access to the context, for now just check if no paint modes are active, default to texture paint.
2010-11-03 21:23:02 +00:00
brush->ob_mode = OB_MODE_ALL_PAINT;
Brush/Paint internal changes - remove brush array for each Paint struct, just use a single brush pointer. - removed rna function based template filtering. - filter brushes using a flag on the brush and the pointer poll function. - set the brushes using a new operator WM_OT_context_set_id(). TODO - remake startup.blend, currently brush groupings are lost. - rewrite WM_OT_context_set_id() to use rna introspection.
2010-08-04 12:18:07 +00:00
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
/* BRUSH SCULPT TOOL SETTINGS */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->weight = 1.0f; /* weight of brush 0 - 1.0 */
brush->size = 35; /* radius of the brush in pixels */
brush->alpha = 0.5f; /* brush strength/intensity probably variable should be renamed? */
brush->autosmooth_factor = 0.0f;
brush->crease_pinch_factor = 0.5f;
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
brush->sculpt_plane = SCULPT_DISP_DIR_AREA;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->plane_offset = 0.0f; /* how far above or below the plane that is found by averaging the faces */
brush->plane_trim = 0.5f;
brush->clone.alpha = 0.5f;
brush->normal_weight = 0.0f;
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
brush->flag |= BRUSH_ALPHA_PRESSURE;
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
/* BRUSH PAINT TOOL SETTINGS */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->rgb[0] = 1.0f; /* default rgb color of the brush when painting - white */
brush->rgb[1] = 1.0f;
brush->rgb[2] = 1.0f;
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
/* BRUSH STROKE SETTINGS */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->flag |= (BRUSH_SPACE | BRUSH_SPACE_ATTEN);
brush->spacing = 10; /* how far each brush dot should be spaced as a percentage of brush diameter */
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->smooth_stroke_radius = 75;
brush->smooth_stroke_factor = 0.9f;
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->rate = 0.1f; /* time delay between dots of paint or sculpting when doing airbrush mode */
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->jitter = 0.0f;
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
/* BRUSH TEXTURE SETTINGS */
Fix [#20756] Texture painting on 3D tends to forget textures in the new texture menu. Part of this fix (loading files with brushes/textures) will only apply for new files saved after this commit
2010-01-22 04:21:46 +00:00
default_mtex(&brush->mtex);
Fixed warnings in sculpt, also brought back brush curve.
2009-01-14 17:22:30 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->texture_sample_bias = 0; /* value to added to texture samples */
brush->texture_overlay_alpha = 33;
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
/* brush appearance */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->add_col[0] = 1.00; /* add mode color is light red */
brush->add_col[1] = 0.39;
brush->add_col[2] = 0.39;
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->sub_col[0] = 0.39; /* subtract mode color is light blue */
brush->sub_col[1] = 0.39;
brush->sub_col[2] = 1.00;
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
}
/* Datablock add/copy/free/make_local */
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
Brush *BKE_brush_add(const char *name)
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
{
Brush *brush;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush = BKE_libblock_alloc(&G.main->brush, ID_BR, name);
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
Brush/Paint internal changes - remove brush array for each Paint struct, just use a single brush pointer. - removed rna function based template filtering. - filter brushes using a flag on the brush and the pointer poll function. - set the brushes using a new operator WM_OT_context_set_id(). TODO - remake startup.blend, currently brush groupings are lost. - rewrite WM_OT_context_set_id() to use rna introspection.
2010-08-04 12:18:07 +00:00
/* enable fake user by default */
brush->id.flag |= LIB_FAKEUSER;
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
brush_defaults(brush);
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
brush->sculpt_tool = SCULPT_TOOL_DRAW; /* sculpting defaults to the draw tool for new brushes */
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
/* the default alpha falloff curve */
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
BKE_brush_curve_preset(brush, CURVE_PRESET_SMOOTH);
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
return brush;
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
Brush *BKE_brush_copy(Brush *brush)
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
{
Brush *brushn;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brushn = BKE_libblock_copy(&brush->id);
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
* can use file for brush icon * fixed memory leaks * moved some of the brush icon code around * the update of the icon after a change is more responsive
2010-07-20 13:42:27 +00:00
if (brush->mtex.tex)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
id_us_plus((ID *)brush->mtex.tex);
* decrementing image_icon ref count from wrong place
2010-07-19 07:29:52 +00:00
* can use file for brush icon * fixed memory leaks * moved some of the brush icon code around * the update of the icon after a change is more responsive
2010-07-20 13:42:27 +00:00
if (brush->icon_imbuf)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brushn->icon_imbuf = IMB_dupImBuf(brush->icon_imbuf);
* Made the default sculpt icons an internal part of the executable * Default icons can be selected from a menu * Option to make a custom icon from a file is present but the UI is disabled because of a mysterious crash * New startup.blend that has the appropriate icons selected
2010-07-20 11:32:30 +00:00
== Sculpt == Fixed bug #23654 Brush copy clears its preview, so that the copied brush's icon isn't linked to the old brush
2010-09-07 03:02:03 +00:00
brushn->preview = NULL;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brushn->curve = curvemapping_copy(brush->curve);
Added a brush panel that can be eventually be used for all the paint modes. For now, just sculpt and texture paint are set up to use it (vpaint and wpaint don't yet use the Brush type.)
2009-03-10 23:38:16 +00:00
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
/* enable fake user by default */
Fix for bug #8746: the fake user button for datablocks was not a toggle button, while it should be.
2008-03-26 20:17:50 +00:00
if (!(brushn->id.flag & LIB_FAKEUSER)) {
brushn->id.flag |= LIB_FAKEUSER;
Brush/Paint internal changes - remove brush array for each Paint struct, just use a single brush pointer. - removed rna function based template filtering. - filter brushes using a flag on the brush and the pointer poll function. - set the brushes using a new operator WM_OT_context_set_id(). TODO - remake startup.blend, currently brush groupings are lost. - rewrite WM_OT_context_set_id() to use rna introspection.
2010-08-04 12:18:07 +00:00
brushn->id.us++;
Fix for bug #8746: the fake user button for datablocks was not a toggle button, while it should be.
2008-03-26 20:17:50 +00:00
}
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
return brushn;
}
/* not brush itself */
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
void BKE_brush_free(Brush *brush)
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
{
* Made the default sculpt icons an internal part of the executable * Default icons can be selected from a menu * Option to make a custom icon from a file is present but the UI is disabled because of a mysterious crash * New startup.blend that has the appropriate icons selected
2010-07-20 11:32:30 +00:00
if (brush->mtex.tex)
brush->mtex.tex->id.us--;
* can use file for brush icon * fixed memory leaks * moved some of the brush icon code around * the update of the icon after a change is more responsive
2010-07-20 13:42:27 +00:00
if (brush->icon_imbuf)
* Made the default sculpt icons an internal part of the executable * Default icons can be selected from a menu * Option to make a custom icon from a file is present but the UI is disabled because of a mysterious crash * New startup.blend that has the appropriate icons selected
2010-07-20 11:32:30 +00:00
IMB_freeImBuf(brush->icon_imbuf);
BKE_previewimg_free(&(brush->preview));
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
Changes/cleanup for sculptdata and brushes. Summary: * Removed texfade, wasn't a very useful option (same result can be created with the falloff curve) * Removed CurveMapping from sculptdata, moved instead to Brush * Removed rake field from sculptdata, moved to Brush.flag * Moved Anchored flag from sculpt to Brush, same for direction field * Removed BrushData, replaced usages with the regular Brush type * Removed hardcoded brushes and brush_type from sculptdata, replaced with a pointer to the current Brush * Made sculpt tool type settable in Brush * Changed symmetry and axis lock fields to flags
2009-01-07 04:38:30 +00:00
curvemapping_free(brush->curve);
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
}
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
static void extern_local_brush(Brush *brush)
{
id_lib_extern((ID *)brush->mtex.tex);
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
id_lib_extern((ID *)brush->clone.image);
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
void BKE_brush_make_local(Brush *brush)
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
{
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
/* - only lib users: do nothing
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
* - only local users: set flag
* - mixed: make copy
*/
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
Main *bmain = G.main;
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
Scene *scene;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int is_local = FALSE, is_lib = FALSE;
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (brush->id.lib == NULL) return;
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (brush->clone.image) {
remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n
2011-10-23 17:52:20 +00:00
/* special case: ima always local immediately. Clone image should only
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
* have one user anyway. */
use path remapping for all make local functions, patch from Alex Fraser with changes.
2011-10-27 05:34:39 +00:00
id_clear_lib_data(bmain, &brush->clone.image->id);
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
extern_local_brush(brush);
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
}
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (scene = bmain->scene.first; scene && ELEM(0, is_lib, is_local); scene = scene->id.next) {
if (paint_brush(&scene->toolsettings->imapaint.paint) == brush) {
if (scene->id.lib) is_lib = TRUE;
else is_local = TRUE;
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
}
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
}
* Made the default sculpt icons an internal part of the executable * Default icons can be selected from a menu * Option to make a custom icon from a file is present but the UI is disabled because of a mysterious crash * New startup.blend that has the appropriate icons selected
2010-07-20 11:32:30 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (is_local && is_lib == FALSE) {
use path remapping for all make local functions, patch from Alex Fraser with changes.
2011-10-27 05:34:39 +00:00
id_clear_lib_data(bmain, &brush->id);
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
extern_local_brush(brush);
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
/* enable fake user by default */
Fix for bug #8746: the fake user button for datablocks was not a toggle button, while it should be.
2008-03-26 20:17:50 +00:00
if (!(brush->id.flag & LIB_FAKEUSER)) {
brush->id.flag |= LIB_FAKEUSER;
Brush/Paint internal changes - remove brush array for each Paint struct, just use a single brush pointer. - removed rna function based template filtering. - filter brushes using a flag on the brush and the pointer poll function. - set the brushes using a new operator WM_OT_context_set_id(). TODO - remake startup.blend, currently brush groupings are lost. - rewrite WM_OT_context_set_id() to use rna introspection.
2010-08-04 12:18:07 +00:00
brush->id.us++;
Fix for bug #8746: the fake user button for datablocks was not a toggle button, while it should be.
2008-03-26 20:17:50 +00:00
}
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
}
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
else if (is_local && is_lib) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
Brush *brush_new = BKE_brush_copy(brush);
brush_new->id.us = 1; /* only keep fake user */
fix [#29459] Crash making a linked object group local was an error with make-local refactor & path updating.
2011-11-30 00:32:13 +00:00
brush_new->id.flag |= LIB_FAKEUSER;
use path remapping for all make local functions, patch from Alex Fraser with changes.
2011-10-27 05:34:39 +00:00
/* Remap paths of new ID using old library as base. */
fix [#29459] Crash making a linked object group local was an error with make-local refactor & path updating.
2011-11-30 00:32:13 +00:00
BKE_id_lib_local_paths(bmain, brush->id.lib, &brush_new->id);
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (scene = bmain->scene.first; scene; scene = scene->id.next) {
if (paint_brush(&scene->toolsettings->imapaint.paint) == brush) {
if (scene->id.lib == NULL) {
fix [#29459] Crash making a linked object group local was an error with make-local refactor & path updating.
2011-11-30 00:32:13 +00:00
paint_brush_set(&scene->toolsettings->imapaint.paint, brush_new);
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
}
fix [#27178] Material links lost when making mesh data local - making local object data - Curve/Mesh/MBall lost references to linked materials. - joining a linked mesh object into a local one lost the link. As well as these reported bugs, checked all local functions for consistency/correctness and found other cases which would also fail. - making local metaball didn't ensure unique ID name. - make_local_armature() was missing check for object users - main body of code would never run. - local particles didn't set the dupli-group or textures to extern. checked all local functions for consistency/correctness.
2011-04-26 07:17:21 +00:00
}
}
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
}
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
void BKE_brush_debug_print_state(Brush *br)
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
{
/* create a fake brush and set it to the defaults */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
Brush def = {{NULL}};
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
brush_defaults(&def);
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
#define BR_TEST(field, t) \
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (br->field != def.field) \
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
printf("br->" #field " = %" #t ";\n", br->field)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
#define BR_TEST_FLAG(_f) \
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if ((br->flag & _f) && !(def.flag & _f)) \
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
printf("br->flag |= " #_f ";\n"); \
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
else if (!(br->flag & _f) && (def.flag & _f)) \
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
printf("br->flag &= ~" #_f ";\n")
/* print out any non-default brush state */
BR_TEST(normal_weight, f);
BR_TEST(blend, d);
BR_TEST(size, d);
/* br->flag */
BR_TEST_FLAG(BRUSH_AIRBRUSH);
BR_TEST_FLAG(BRUSH_TORUS);
BR_TEST_FLAG(BRUSH_ALPHA_PRESSURE);
BR_TEST_FLAG(BRUSH_SIZE_PRESSURE);
BR_TEST_FLAG(BRUSH_JITTER_PRESSURE);
BR_TEST_FLAG(BRUSH_SPACING_PRESSURE);
BR_TEST_FLAG(BRUSH_RAKE);
BR_TEST_FLAG(BRUSH_ANCHORED);
BR_TEST_FLAG(BRUSH_DIR_IN);
BR_TEST_FLAG(BRUSH_SPACE);
BR_TEST_FLAG(BRUSH_SMOOTH_STROKE);
BR_TEST_FLAG(BRUSH_PERSISTENT);
BR_TEST_FLAG(BRUSH_ACCUMULATE);
BR_TEST_FLAG(BRUSH_LOCK_ALPHA);
BR_TEST_FLAG(BRUSH_ORIGINAL_NORMAL);
BR_TEST_FLAG(BRUSH_OFFSET_PRESSURE);
BR_TEST_FLAG(BRUSH_SPACE_ATTEN);
BR_TEST_FLAG(BRUSH_ADAPTIVE_SPACE);
BR_TEST_FLAG(BRUSH_LOCK_SIZE);
BR_TEST_FLAG(BRUSH_TEXTURE_OVERLAY);
BR_TEST_FLAG(BRUSH_EDGE_TO_EDGE);
BR_TEST_FLAG(BRUSH_RESTORE_MESH);
BR_TEST_FLAG(BRUSH_INVERSE_SMOOTH_PRESSURE);
BR_TEST_FLAG(BRUSH_RANDOM_ROTATION);
BR_TEST_FLAG(BRUSH_PLANE_TRIM);
BR_TEST_FLAG(BRUSH_FRONTFACE);
BR_TEST_FLAG(BRUSH_CUSTOM_ICON);
BR_TEST(jitter, f);
BR_TEST(spacing, d);
BR_TEST(smooth_stroke_radius, d);
BR_TEST(smooth_stroke_factor, f);
BR_TEST(rate, f);
BR_TEST(alpha, f);
BR_TEST(sculpt_plane, d);
BR_TEST(plane_offset, f);
BR_TEST(autosmooth_factor, f);
BR_TEST(crease_pinch_factor, f);
BR_TEST(plane_trim, f);
BR_TEST(texture_sample_bias, f);
BR_TEST(texture_overlay_alpha, d);
BR_TEST(add_col[0], f);
BR_TEST(add_col[1], f);
BR_TEST(add_col[2], f);
BR_TEST(sub_col[0], f);
BR_TEST(sub_col[1], f);
BR_TEST(sub_col[2], f);
printf("\n");
#undef BR_TEST
#undef BR_TEST_FLAG
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
void BKE_brush_sculpt_reset(Brush *br)
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
{
/* enable this to see any non-default
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
* settings used by a brush: */
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
// BKE_brush_debug_print_state(br);
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
brush_defaults(br);
BKE_brush_curve_preset(br, CURVE_PRESET_SMOOTH);
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
switch (br->sculpt_tool) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
case SCULPT_TOOL_CLAY:
br->flag |= BRUSH_FRONTFACE;
break;
case SCULPT_TOOL_CREASE:
br->flag |= BRUSH_DIR_IN;
br->alpha = 0.25;
break;
case SCULPT_TOOL_FILL:
br->add_col[1] = 1;
br->sub_col[0] = 0.25;
br->sub_col[1] = 1;
break;
case SCULPT_TOOL_FLATTEN:
br->add_col[1] = 1;
br->sub_col[0] = 0.25;
br->sub_col[1] = 1;
break;
case SCULPT_TOOL_INFLATE:
br->add_col[0] = 0.750000;
br->add_col[1] = 0.750000;
br->add_col[2] = 0.750000;
br->sub_col[0] = 0.250000;
br->sub_col[1] = 0.250000;
br->sub_col[2] = 0.250000;
break;
case SCULPT_TOOL_NUDGE:
br->add_col[0] = 0.250000;
br->add_col[1] = 1.000000;
br->add_col[2] = 0.250000;
break;
case SCULPT_TOOL_PINCH:
br->add_col[0] = 0.750000;
br->add_col[1] = 0.750000;
br->add_col[2] = 0.750000;
br->sub_col[0] = 0.250000;
br->sub_col[1] = 0.250000;
br->sub_col[2] = 0.250000;
break;
case SCULPT_TOOL_SCRAPE:
br->add_col[1] = 1.000000;
br->sub_col[0] = 0.250000;
br->sub_col[1] = 1.000000;
break;
case SCULPT_TOOL_ROTATE:
br->alpha = 1.0;
break;
case SCULPT_TOOL_SMOOTH:
br->flag &= ~BRUSH_SPACE_ATTEN;
br->spacing = 5;
br->add_col[0] = 0.750000;
br->add_col[1] = 0.750000;
br->add_col[2] = 0.750000;
break;
case SCULPT_TOOL_GRAB:
case SCULPT_TOOL_SNAKE_HOOK:
case SCULPT_TOOL_THUMB:
br->size = 75;
br->flag &= ~BRUSH_ALPHA_PRESSURE;
br->flag &= ~BRUSH_SPACE;
br->flag &= ~BRUSH_SPACE_ATTEN;
br->add_col[0] = 0.250000;
br->add_col[1] = 1.000000;
br->add_col[2] = 0.250000;
break;
default:
break;
== Sculpt == Added a brush reset operator so that a user won't need to reload the default blend to get back default brush settings * New brush.reset operator, resets a brush based on the currently-selected tool * Added UI button in the tools panel TODO: * Only resets sculpt brushes right now, other paint modes should be added * Sculpt polish tool exists only as a Brush, not as a tool; I'd suggest we make it a tool so it can be reset to defaults too
2010-07-27 16:09:02 +00:00
}
}
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
/* Library Operations */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
void BKE_brush_curve_preset(Brush *b, /*CurveMappingPreset*/ int preset)
Changes/cleanup for sculptdata and brushes. Summary: * Removed texfade, wasn't a very useful option (same result can be created with the falloff curve) * Removed CurveMapping from sculptdata, moved instead to Brush * Removed rake field from sculptdata, moved to Brush.flag * Moved Anchored flag from sculpt to Brush, same for direction field * Removed BrushData, replaced usages with the regular Brush type * Removed hardcoded brushes and brush_type from sculptdata, replaced with a pointer to the current Brush * Made sculpt tool type settable in Brush * Changed symmetry and axis lock fields to flags
2009-01-07 04:38:30 +00:00
{
CurveMap *cm = NULL;
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (!b->curve)
Changes/cleanup for sculptdata and brushes. Summary: * Removed texfade, wasn't a very useful option (same result can be created with the falloff curve) * Removed CurveMapping from sculptdata, moved instead to Brush * Removed rake field from sculptdata, moved to Brush.flag * Moved Anchored flag from sculpt to Brush, same for direction field * Removed BrushData, replaced usages with the regular Brush type * Removed hardcoded brushes and brush_type from sculptdata, replaced with a pointer to the current Brush * Made sculpt tool type settable in Brush * Changed symmetry and axis lock fields to flags
2009-01-07 04:38:30 +00:00
b->curve = curvemapping_add(1, 0, 0, 1, 1);
cm = b->curve->cm;
Started converting over the sculpt header menu to the new system. Added operator and menu items for brush curve presets.
2009-02-07 03:21:28 +00:00
cm->flag &= ~CUMA_EXTEND_EXTRAPOLATE;
Fix [#21188] HueCorrection Node, when reseting Curve, it goes to a incline instead of flat/straight
2010-03-09 07:41:27 +00:00
b->curve->preset = preset;
Preview commit in sculpt brushes broke resetting curves in other areas (rgb curves etc). Fixed by adding a 'slope' parameter to curvemap_reset() to mirror curve presets around Y axis. Also removed curve preset with 'random' icon, wasn't doing what it looked like it should, this was intended only for hue correct node anyway.
2010-07-30 00:06:59 +00:00
curvemap_reset(cm, &b->curve->clipr, b->curve->preset, CURVEMAP_SLOPE_NEGATIVE);
code cleanup: don't use magic numbers for curve flag & use bool args for curvemapping_changed()
2012-08-21 08:47:36 +00:00
curvemapping_changed(b->curve, FALSE);
Changes/cleanup for sculptdata and brushes. Summary: * Removed texfade, wasn't a very useful option (same result can be created with the falloff curve) * Removed CurveMapping from sculptdata, moved instead to Brush * Removed rake field from sculptdata, moved to Brush.flag * Moved Anchored flag from sculpt to Brush, same for direction field * Removed BrushData, replaced usages with the regular Brush type * Removed hardcoded brushes and brush_type from sculptdata, replaced with a pointer to the current Brush * Made sculpt tool type settable in Brush * Changed symmetry and axis lock fields to flags
2009-01-07 04:38:30 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
int BKE_brush_texture_set_nr(Brush *brush, int nr)
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ID *idtest, *id = NULL;
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
id = (ID *)brush->mtex.tex;
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
idtest = (ID *)BLI_findlink(&G.main->tex, nr - 1);
if (idtest == NULL) { /* new tex */
if (id) idtest = (ID *)BKE_texture_copy((Tex *)id);
else idtest = (ID *)add_texture("Tex");
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
idtest->us--;
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (idtest != id) {
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
BKE_brush_texture_delete(brush);
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->mtex.tex = (Tex *)idtest;
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
id_us_plus(idtest);
return 1;
}
return 0;
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
int BKE_brush_texture_delete(Brush *brush)
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
{
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (brush->mtex.tex)
Changes to Brush texture workflow This changes how textures are accessed from Brushes, with the intention of simplifying the workflow, and reducing the amount of clicking. Rather than the previous texture slots (which didn't work as a stack anyway), brushes now have a single texture linked. Rather than taking time having to set up your slots in advance, you can now select and change textures directly as you sculpt/paint on the fly. For complex brushes, node textures can be used, or for fast access, it's easy to make a duplicate of your brush with the texture you like and assign a hotkey. Brush textures can now be chosen from a new Textures panel in the brush tool properties - click on the thumbnail to open a texture selector. This is done using a new variation on the ID template - the number of rows and columns to display in the popup can be customised in the UI scripts.
2010-01-03 08:37:18 +00:00
brush->mtex.tex->id.us--;
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
Changes to Brush texture workflow This changes how textures are accessed from Brushes, with the intention of simplifying the workflow, and reducing the amount of clicking. Rather than the previous texture slots (which didn't work as a stack anyway), brushes now have a single texture linked. Rather than taking time having to set up your slots in advance, you can now select and change textures directly as you sculpt/paint on the fly. For complex brushes, node textures can be used, or for fast access, it's easy to make a duplicate of your brush with the texture you like and assign a hotkey. Brush textures can now be chosen from a new Textures panel in the brush tool properties - click on the thumbnail to open a texture selector. This is done using a new variation on the ID template - the number of rows and columns to display in the popup can be customised in the UI scripts.
2010-01-03 08:37:18 +00:00
return 1;
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
int BKE_brush_clone_image_set_nr(Brush *brush, int nr)
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
{
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (brush && nr > 0) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
Image *ima = (Image *)BLI_findlink(&G.main->image, nr - 1);
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (ima) {
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
BKE_brush_clone_image_delete(brush);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->clone.image = ima;
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
id_us_plus(&ima->id);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->clone.offset[0] = brush->clone.offset[1] = 0.0f;
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
return 1;
}
}
return 0;
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
int BKE_brush_clone_image_delete(Brush *brush)
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
{
if (brush && brush->clone.image) {
brush->clone.image->id.us--;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->clone.image = NULL;
Brush Datablock: - Added a new Brush datablock, only used by image paint, but intended to be used in texture paint, vertex paint, weight paint and sculpt mode also. - Being a datablock, these brushes can be saved, appended and linked. They have a fake user by default, to make sure they are saved even if not selected. Image Painting: - Replaced the img module with C code in imagepaint.c - Airbrush is no longer a separate tool, but rather an option that can be used for soften, smear and clone also. - Blend modes mix, add, subtract, multiply, darken and lighten have been added, code taken directly from vertex paint. Note to project files maintainers: - The img module was removed from SCons and Makefiles, and this should be done in other build systems also. I'll wait to remove the module from cvs, to not break compilation.
2006-07-26 22:29:23 +00:00
return 1;
}
return 0;
}
3D mapping for projective texture painting (only for draw brush). Useful to draw with procedural textures on surface of object. 2D painting will still paint as if tiled. When we unify the paint systems, the texture sampling functions will need to be changed. Sculpt uses a slightly different system that passes both screen and 3d coordinates to the sampling function. This commit however is not too disrupting for that however so it can go in now.
2013-01-20 21:32:14 +00:00
/* Brush Sampling for 3d brushes. Currently used for texture painting only, but should be generalized */
void BKE_brush_sample_tex(const Scene *scene, Brush *brush, const float sampleco[3], float rgba[4], const int thread)
{
MTex *mtex = &brush->mtex;
if (mtex && mtex->tex) {
float co[3], tin, tr, tg, tb, ta;
int hasrgb;
const int radius = BKE_brush_size_get(scene, brush);
if (brush->mtex.brush_map_mode == MTEX_MAP_MODE_3D) {
copy_v3_v3(co, sampleco);
} else {
co[0] = sampleco[0] / radius;
co[1] = sampleco[1] / radius;
co[2] = 0.0f;
}
hasrgb = externtex(mtex, co, &tin, &tr, &tg, &tb, &ta, thread);
if (hasrgb) {
rgba[0] = tr;
rgba[1] = tg;
rgba[2] = tb;
rgba[3] = ta;
}
else {
rgba[0] = tin;
rgba[1] = tin;
rgba[2] = tin;
rgba[3] = 1.0f;
}
}
else {
rgba[0] = rgba[1] = rgba[2] = rgba[3] = 1.0f;
}
}
/* Brush Sampling for 2D brushes. when we unify the brush systems this will be necessarily a separate function */
void BKE_brush_sample_tex_2D(const Scene *scene, Brush *brush, const float xy[2], float rgba[4], const int thread)
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
MTex *mtex = &brush->mtex;
Bugfix: texture paint brushes didn't work correct with multiple texture channels.
2007-02-09 15:08:53 +00:00
if (mtex && mtex->tex) {
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
float co[3], tin, tr, tg, tb, ta;
int hasrgb;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
const int radius = BKE_brush_size_get(scene, brush);
== 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
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
co[0] = xy[0] / radius;
co[1] = xy[1] / radius;
co[2] = 0.0f;
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
hasrgb = externtex(mtex, co, &tin, &tr, &tg, &tb, &ta, thread);
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
if (hasrgb) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
rgba[0] = tr;
rgba[1] = tg;
rgba[2] = tb;
rgba[3] = ta;
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
}
else {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
rgba[0] = tin;
rgba[1] = tin;
rgba[2] = tin;
rgba[3] = 1.0f;
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
}
}
ensure functions are not used within FTOCHAR macro since they run 2-3 times. brushes were doing curve lookups within this macro for example.
2012-01-14 10:33:16 +00:00
else {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
rgba[0] = rgba[1] = rgba[2] = rgba[3] = 1.0f;
ensure functions are not used within FTOCHAR macro since they run 2-3 times. brushes were doing curve lookups within this macro for example.
2012-01-14 10:33:16 +00:00
}
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
}
3D mapping for projective texture painting (only for draw brush). Useful to draw with procedural textures on surface of object. 2D painting will still paint as if tiled. When we unify the paint systems, the texture sampling functions will need to be changed. Sculpt uses a slightly different system that passes both screen and 3d coordinates to the sampling function. This commit however is not too disrupting for that however so it can go in now.
2013-01-20 21:32:14 +00:00
/* TODO, use define for 'texfall' arg
* NOTE: only used for 2d brushes currently! */
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
void BKE_brush_imbuf_new(const Scene *scene, Brush *brush, short flt, short texfall, int bufsize, ImBuf **outbuf, int use_color_correction)
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
{
ImBuf *ibuf;
ensure functions are not used within FTOCHAR macro since they run 2-3 times. brushes were doing curve lookups within this macro for example.
2012-01-14 10:33:16 +00:00
float xy[2], rgba[4], *dstf;
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
int x, y, rowbytes, xoff, yoff, imbflag;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
const int radius = BKE_brush_size_get(scene, brush);
use color conversions functions in more places. also add rgba_float_to_uchar, rgba_uchar_to_float
2012-01-19 10:04:51 +00:00
unsigned char *dst, crgb[3];
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
const float alpha = BKE_brush_alpha_get(scene, brush);
fix for float projection painting, now updating correctly. This fix also allows for partial update of the image, speeding up painting. The different code path implemented will be used to upload high resolution images to OpenGL when onion branch is merged. Due to conversion of float textures to/from sRGB, corrections made to brush color sampling to take account of the image profile. This is not 100% correct yet as texture images used for projection painting strokes are not converted to/from sRGB yet(This has been decided due to loss of precision for 8-bit formats). It will have to do for now, though. last-minute update, exr image loading is broken, will fix asap
2011-06-06 22:10:05 +00:00
float brush_rgb[3];
style cleanup
2012-09-30 06:12:47 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
imbflag = (flt) ? IB_rectfloat : IB_rect;
xoff = -bufsize / 2.0f + 0.5f;
yoff = -bufsize / 2.0f + 0.5f;
rowbytes = bufsize * 4;
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
if (*outbuf)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ibuf = *outbuf;
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
else
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ibuf = IMB_allocImBuf(bufsize, bufsize, 32, imbflag);
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
if (flt) {
fix for float projection painting, now updating correctly. This fix also allows for partial update of the image, speeding up painting. The different code path implemented will be used to upload high resolution images to OpenGL when onion branch is merged. Due to conversion of float textures to/from sRGB, corrections made to brush color sampling to take account of the image profile. This is not 100% correct yet as texture images used for projection painting strokes are not converted to/from sRGB yet(This has been decided due to loss of precision for 8-bit formats). It will have to do for now, though. last-minute update, exr image loading is broken, will fix asap
2011-06-06 22:10:05 +00:00
copy_v3_v3(brush_rgb, brush->rgb);
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (use_color_correction) {
fix for float projection painting, now updating correctly. This fix also allows for partial update of the image, speeding up painting. The different code path implemented will be used to upload high resolution images to OpenGL when onion branch is merged. Due to conversion of float textures to/from sRGB, corrections made to brush color sampling to take account of the image profile. This is not 100% correct yet as texture images used for projection painting strokes are not converted to/from sRGB yet(This has been decided due to loss of precision for 8-bit formats). It will have to do for now, though. last-minute update, exr image loading is broken, will fix asap
2011-06-06 22:10:05 +00:00
srgb_to_linearrgb_v3_v3(brush_rgb, brush_rgb);
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (y = 0; y < ibuf->y; y++) {
dstf = ibuf->rect_float + y * rowbytes;
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (x = 0; x < ibuf->x; x++, dstf += 4) {
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
xy[0] = x + xoff;
xy[1] = y + yoff;
if (texfall == 0) {
minor edits / cleanup - no functional changes. - use 'const float *' and array size in some function declarations. - replace macros for BLI_math functions INPF, VECCOPY, VECADD etc. - remove unused VertRen.clip struct member. - remove static squared_dist() from 2 files, replace with BLI_math function len_squared_v3v3(). - use vertex arrays for drawing clipping background in the 3D viewport.
2011-09-11 02:50:01 +00:00
copy_v3_v3(dstf, brush_rgb);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
dstf[3] = alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
}
else if (texfall == 1) {
3D mapping for projective texture painting (only for draw brush). Useful to draw with procedural textures on surface of object. 2D painting will still paint as if tiled. When we unify the paint systems, the texture sampling functions will need to be changed. Sculpt uses a slightly different system that passes both screen and 3d coordinates to the sampling function. This commit however is not too disrupting for that however so it can go in now.
2013-01-20 21:32:14 +00:00
BKE_brush_sample_tex_2D(scene, brush, xy, dstf, 0);
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
}
else {
3D mapping for projective texture painting (only for draw brush). Useful to draw with procedural textures on surface of object. 2D painting will still paint as if tiled. When we unify the paint systems, the texture sampling functions will need to be changed. Sculpt uses a slightly different system that passes both screen and 3d coordinates to the sampling function. This commit however is not too disrupting for that however so it can go in now.
2013-01-20 21:32:14 +00:00
BKE_brush_sample_tex_2D(scene, brush, xy, rgba, 0);
fix for float projection painting, now updating correctly. This fix also allows for partial update of the image, speeding up painting. The different code path implemented will be used to upload high resolution images to OpenGL when onion branch is merged. Due to conversion of float textures to/from sRGB, corrections made to brush color sampling to take account of the image profile. This is not 100% correct yet as texture images used for projection painting strokes are not converted to/from sRGB yet(This has been decided due to loss of precision for 8-bit formats). It will have to do for now, though. last-minute update, exr image loading is broken, will fix asap
2011-06-06 22:10:05 +00:00
mul_v3_v3v3(dstf, rgba, brush_rgb);
style cleanup
2012-09-30 06:12:47 +00:00
dstf[3] = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
}
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
}
}
}
else {
ensure functions are not used within FTOCHAR macro since they run 2-3 times. brushes were doing curve lookups within this macro for example.
2012-01-14 10:33:16 +00:00
float alpha_f; /* final float alpha to convert to char */
use color conversions functions in more places. also add rgba_float_to_uchar, rgba_uchar_to_float
2012-01-19 10:04:51 +00:00
rgb_float_to_uchar(crgb, brush->rgb);
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (y = 0; y < ibuf->y; y++) {
dst = (unsigned char *)ibuf->rect + y * rowbytes;
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (x = 0; x < ibuf->x; x++, dst += 4) {
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
xy[0] = x + xoff;
xy[1] = y + yoff;
if (texfall == 0) {
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
alpha_f = alpha * BKE_brush_curve_strength(brush, len_v2(xy), radius);
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
ensure functions are not used within FTOCHAR macro since they run 2-3 times. brushes were doing curve lookups within this macro for example.
2012-01-14 10:33:16 +00:00
dst[0] = crgb[0];
dst[1] = crgb[1];
dst[2] = crgb[2];
dst[3] = FTOCHAR(alpha_f);
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
}
else if (texfall == 1) {
3D mapping for projective texture painting (only for draw brush). Useful to draw with procedural textures on surface of object. 2D painting will still paint as if tiled. When we unify the paint systems, the texture sampling functions will need to be changed. Sculpt uses a slightly different system that passes both screen and 3d coordinates to the sampling function. This commit however is not too disrupting for that however so it can go in now.
2013-01-20 21:32:14 +00:00
BKE_brush_sample_tex_2D(scene, brush, xy, rgba, 0);
use color conversions functions in more places. also add rgba_float_to_uchar, rgba_uchar_to_float
2012-01-19 10:04:51 +00:00
rgba_float_to_uchar(dst, rgba);
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
}
Fix #26218: texture paint - Added option "Fixed Texture" to the UI. Because of strange reason, this feature was implemented but hidden from users. Would be cool, if somebody familiar with 2d texture paiting check. - Fixed some issues in existing code of fixed texture paiting. It now handles brush radius and curve correct. - Also fixed issue with paiting with texture from node tree - it used to be painted with regular brush color instead of texture.
2011-03-01 17:58:12 +00:00
else if (texfall == 2) {
3D mapping for projective texture painting (only for draw brush). Useful to draw with procedural textures on surface of object. 2D painting will still paint as if tiled. When we unify the paint systems, the texture sampling functions will need to be changed. Sculpt uses a slightly different system that passes both screen and 3d coordinates to the sampling function. This commit however is not too disrupting for that however so it can go in now.
2013-01-20 21:32:14 +00:00
BKE_brush_sample_tex_2D(scene, brush, xy, rgba, 0);
ensure functions are not used within FTOCHAR macro since they run 2-3 times. brushes were doing curve lookups within this macro for example.
2012-01-14 10:33:16 +00:00
mul_v3_v3(rgba, brush->rgb);
style cleanup
2012-09-30 06:12:47 +00:00
alpha_f = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
Fix #26218: texture paint - Added option "Fixed Texture" to the UI. Because of strange reason, this feature was implemented but hidden from users. Would be cool, if somebody familiar with 2d texture paiting check. - Fixed some issues in existing code of fixed texture paiting. It now handles brush radius and curve correct. - Also fixed issue with paiting with texture from node tree - it used to be painted with regular brush color instead of texture.
2011-03-01 17:58:12 +00:00
use color conversions functions in more places. also add rgba_float_to_uchar, rgba_uchar_to_float
2012-01-19 10:04:51 +00:00
rgb_float_to_uchar(dst, rgba);
ensure functions are not used within FTOCHAR macro since they run 2-3 times. brushes were doing curve lookups within this macro for example.
2012-01-14 10:33:16 +00:00
dst[3] = FTOCHAR(alpha_f);
}
else {
3D mapping for projective texture painting (only for draw brush). Useful to draw with procedural textures on surface of object. 2D painting will still paint as if tiled. When we unify the paint systems, the texture sampling functions will need to be changed. Sculpt uses a slightly different system that passes both screen and 3d coordinates to the sampling function. This commit however is not too disrupting for that however so it can go in now.
2013-01-20 21:32:14 +00:00
BKE_brush_sample_tex_2D(scene, brush, xy, rgba, 0);
style cleanup
2012-09-30 06:12:47 +00:00
alpha_f = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
ensure functions are not used within FTOCHAR macro since they run 2-3 times. brushes were doing curve lookups within this macro for example.
2012-01-14 10:33:16 +00:00
dst[0] = crgb[0];
dst[1] = crgb[1];
dst[2] = crgb[2];
dst[3] = FTOCHAR(alpha_f);
Texturepaint now supports all the imagepaint brush settings, with the exception of the clone tool. One level undo for image- and texturepaint, only storing those tiles that changed. Test to improve texturepaint performance using glTexSubImage2D, only enabled with 2^n sized textures and mipmapping off. Painting a 2048x2048 texture is then pretty smooth here, as long as the geometry is not too complex.
2006-08-27 13:29:00 +00:00
}
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
}
}
}
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
*outbuf = ibuf;
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
}
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
/* Unified Size and Strength */
style cleanup: comments
2012-10-20 20:20:02 +00:00
/* XXX: be careful about setting size and unprojected radius
* because they depend on one another
* these functions do not set the other corresponding value
* this can lead to odd behavior if size and unprojected
* radius become inconsistent.
* the biggest problem is that it isn't possible to change
* unprojected radius because a view context is not
* available. my ussual solution to this is to use the
* ratio of change of the size to change the unprojected
* radius. Not completely convinced that is correct.
* In anycase, a better solution is needed to prevent
* inconsistency. */
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
void BKE_brush_size_set(Scene *scene, Brush *brush, int size)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
{
UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
if (ups->flag & UNIFIED_PAINT_SIZE)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ups->size = size;
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
else
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->size = size;
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
int BKE_brush_size_get(const Scene *scene, Brush *brush)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
{
UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
Fixes for correct UI scaling display: - Move to layer (and more popups) didn't scale yet - User Prefs and render window now open on right location on Mac Retinas - Brush sizes for painting now scale for Mac Retina
2012-12-14 15:09:59 +00:00
int size = (ups->flag & UNIFIED_PAINT_SIZE) ? ups->size : brush->size;
return (int)((float)size * U.pixelsize);
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
int BKE_brush_use_locked_size(const Scene *scene, Brush *brush)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
{
const short us_flag = scene->toolsettings->unified_paint_settings.flag;
return (us_flag & UNIFIED_PAINT_SIZE) ?
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
(us_flag & UNIFIED_PAINT_BRUSH_LOCK_SIZE) :
(brush->flag & BRUSH_LOCK_SIZE);
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
int BKE_brush_use_size_pressure(const Scene *scene, Brush *brush)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
{
const short us_flag = scene->toolsettings->unified_paint_settings.flag;
return (us_flag & UNIFIED_PAINT_SIZE) ?
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
(us_flag & UNIFIED_PAINT_BRUSH_SIZE_PRESSURE) :
(brush->flag & BRUSH_SIZE_PRESSURE);
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
int BKE_brush_use_alpha_pressure(const Scene *scene, Brush *brush)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
{
const short us_flag = scene->toolsettings->unified_paint_settings.flag;
return (us_flag & UNIFIED_PAINT_ALPHA) ?
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
(us_flag & UNIFIED_PAINT_BRUSH_ALPHA_PRESSURE) :
(brush->flag & BRUSH_ALPHA_PRESSURE);
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
void BKE_brush_unprojected_radius_set(Scene *scene, Brush *brush, float unprojected_radius)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
{
UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
if (ups->flag & UNIFIED_PAINT_SIZE)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ups->unprojected_radius = unprojected_radius;
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
else
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->unprojected_radius = unprojected_radius;
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
float BKE_brush_unprojected_radius_get(const Scene *scene, Brush *brush)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
{
UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
return (ups->flag & UNIFIED_PAINT_SIZE) ?
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ups->unprojected_radius :
brush->unprojected_radius;
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
}
Code cleanup: Separate 2D painting functions away from brush.c, which should implement the brush API and into its own file, paint_2D.c. Ideally projective texturing and 2D painting should be totally separate, however functionality is still interleaved mostly in the BKE_brush_painter_paint function. The functionality of this function can possibly be done using the brush stroke functions instead.
2013-01-01 21:23:12 +00:00
void BKE_brush_alpha_set(Scene *scene, Brush *brush, float alpha)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
{
UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
if (ups->flag & UNIFIED_PAINT_ALPHA)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
ups->alpha = alpha;
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
else
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
brush->alpha = alpha;
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
float BKE_brush_alpha_get(const Scene *scene, Brush *brush)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
{
UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
return (ups->flag & UNIFIED_PAINT_ALPHA) ? ups->alpha : brush->alpha;
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
float BKE_brush_weight_get(const Scene *scene, Brush *brush)
Add per-brush weight field. Patch from Jaggz H, thanks! [#31096] Weight-painting: Brush-specific weights http://projects.blender.org/tracker/?func=detail&atid=127&aid=31096&group_id=9 Each brush's weight can now be set individually, can also enable unified setting (same as size and strength have.) Added readfile code to the patch: subversion bumped to 1, brushes get default weight of 0.5, unified weight enabled by default and value from old vgroup_weight field.
2012-04-29 20:04:25 +00:00
{
UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
return (ups->flag & UNIFIED_PAINT_WEIGHT) ? ups->weight : brush->weight;
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
void BKE_brush_weight_set(const Scene *scene, Brush *brush, float value)
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
{
UnifiedPaintSettings *ups = &scene->toolsettings->unified_paint_settings;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (ups->flag & UNIFIED_PAINT_WEIGHT)
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
ups->weight = value;
else
brush->weight = value;
}
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
/* scale unprojected radius to reflect a change in the brush's 2D size */
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
void BKE_brush_scale_unprojected_radius(float *unprojected_radius,
int new_brush_size,
int old_brush_size)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
{
float scale = new_brush_size;
/* avoid division by zero */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (old_brush_size != 0)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
scale /= (float)old_brush_size;
(*unprojected_radius) *= scale;
}
/* scale brush size to reflect a change in the brush's unprojected radius */
quiet some -Wshadow warnings
2012-10-12 14:35:10 +00:00
void BKE_brush_scale_size(int *r_brush_size,
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
float new_unprojected_radius,
float old_unprojected_radius)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
{
float scale = new_unprojected_radius;
/* avoid division by zero */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (old_unprojected_radius != 0)
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
scale /= new_unprojected_radius;
quiet some -Wshadow warnings
2012-10-12 14:35:10 +00:00
(*r_brush_size) = (int)((float)(*r_brush_size) * scale);
Fix all remaining unified paint settings uses of current Scene. Things like brush size and strength accessors now take a scene parameter rather than guessing about which Scene's unified paint settings to use. Setting the size/strength through RNA can now be done separately for the brush or the UnifiedPaintSettings. The UI python code required updating to check whether the size/strength controls should use brush or UnifiedPaintSettings RNA. Radial control also required some updates to switch between the two RNA sources.
2012-01-14 23:54:51 +00:00
}
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
void BKE_brush_jitter_pos(const Scene *scene, Brush *brush, const float pos[2], float jitterpos[2])
- jitter for painting (image and projection painting, others can be added) - remove falloff setting now the curve is used. - bugfix for airbrush & tablet, with no movement it would assume 1.0 pressure. - rna, use the use_* prefix for brush options.
2009-09-18 11:25:52 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
int use_jitter = brush->jitter != 0;
Fix #25933: Drag Dog stroke method uses Jitter if set for other stroke method, but no jitter available. Manually disable jitter usage for anchored and drag dot brush stroke metdhods. Jitter slider is hidden in UI for this strokes so users can't set it to 0 by hand and even if this slider would be visible in UI jitter gives wierd result for this stroke methods.
2011-02-04 16:10:30 +00:00
fix some typo's
2011-10-23 15:27:36 +00:00
/* jitter-ed brush gives weird and unpredictable result for this
fix some types and incorrect info
2012-07-26 17:41:09 +00:00
* kinds of stroke, so manually disable jitter usage (sergey) */
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
use_jitter &= (brush->flag & (BRUSH_RESTORE_MESH | BRUSH_ANCHORED)) == 0;
Fix #25933: Drag Dog stroke method uses Jitter if set for other stroke method, but no jitter available. Manually disable jitter usage for anchored and drag dot brush stroke metdhods. Jitter slider is hidden in UI for this strokes so users can't set it to 0 by hand and even if this slider would be visible in UI jitter gives wierd result for this stroke methods.
2011-02-04 16:10:30 +00:00
style cleanup for blenkernel, no functional changes.
2012-02-23 02:17:50 +00:00
if (use_jitter) {
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
float rand_pos[2];
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
const int radius = BKE_brush_size_get(scene, brush);
const int diameter = 2 * radius;
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
style cleanup
2012-07-07 22:51:57 +00:00
/* find random position within a circle of diameter 1 */
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
do {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
rand_pos[0] = BLI_frand() - 0.5f;
rand_pos[1] = BLI_frand() - 0.5f;
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
} while (len_v2(rand_pos) > 0.5f);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
jitterpos[0] = pos[0] + 2 * rand_pos[0] * diameter * brush->jitter;
jitterpos[1] = pos[1] + 2 * rand_pos[1] * diameter * brush->jitter;
- jitter for painting (image and projection painting, others can be added) - remove falloff setting now the curve is used. - bugfix for airbrush & tablet, with no movement it would assume 1.0 pressure. - rna, use the use_* prefix for brush options.
2009-09-18 11:25:52 +00:00
}
else {
minor edits / cleanup - no functional changes. - use 'const float *' and array size in some function declarations. - replace macros for BLI_math functions INPF, VECCOPY, VECADD etc. - remove unused VertRen.clip struct member. - remove static squared_dist() from 2 files, replace with BLI_math function len_squared_v3v3(). - use vertex arrays for drawing clipping background in the 3D viewport.
2011-09-11 02:50:01 +00:00
copy_v2_v2(jitterpos, pos);
- jitter for painting (image and projection painting, others can be added) - remove falloff setting now the curve is used. - bugfix for airbrush & tablet, with no movement it would assume 1.0 pressure. - rna, use the use_* prefix for brush options.
2009-09-18 11:25:52 +00:00
}
}
Did some refactoring with brush and sculpt to make radial control easier to add to other modes.
2009-01-25 07:28:11 +00:00
/* Uses the brush curve control to find a strength value between 0 and 1 */
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
float BKE_brush_curve_strength_clamp(Brush *br, float p, const float len)
brush curve - use clamped values (0-1) for everything except sculpt which can have positive and negative values.
2009-09-24 01:32:23 +00:00
{
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (p >= len) return 0;
else p = p / len;
brush curve - use clamped values (0-1) for everything except sculpt which can have positive and negative values.
2009-09-24 01:32:23 +00:00
change curve evaluation functions never to modify curve data (ensures thread safety), now initializations has to be done outside evaluation.
2012-08-21 14:43:51 +00:00
curvemapping_initialize(br->curve);
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
p = curvemapping_evaluateF(br->curve, 0, p);
change curve evaluation functions never to modify curve data (ensures thread safety), now initializations has to be done outside evaluation.
2012-08-21 14:43:51 +00:00
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
if (p < 0.0f) p = 0.0f;
else if (p > 1.0f) p = 1.0f;
brush curve - use clamped values (0-1) for everything except sculpt which can have positive and negative values.
2009-09-24 01:32:23 +00:00
return p;
}
/* same as above but can return negative values if the curve enables
* used for sculpt only */
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
float BKE_brush_curve_strength(Brush *br, float p, const float len)
Did some refactoring with brush and sculpt to make radial control easier to add to other modes.
2009-01-25 07:28:11 +00:00
{
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (p >= len)
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
p = 1.0f;
whitespace only, no functional change mixed tabs/spaces --> tabs.
2011-04-21 13:11:51 +00:00
else
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
p = p / len;
Merge GSOC Sculpt Branch: 28499-30319 https://svn.blender.org/svnroot/bf-blender/branches/soc-2010-jwilkins See log of that branch for details.
2010-07-14 14:11:03 +00:00
change curve evaluation functions never to modify curve data (ensures thread safety), now initializations has to be done outside evaluation.
2012-08-21 14:43:51 +00:00
curvemapping_initialize(br->curve);
whitespace only, no functional change mixed tabs/spaces --> tabs.
2011-04-21 13:11:51 +00:00
return curvemapping_evaluateF(br->curve, 0, p);
Did some refactoring with brush and sculpt to make radial control easier to add to other modes.
2009-01-25 07:28:11 +00:00
}
/**** Radial Control ****/
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
struct ImBuf *BKE_brush_gen_radial_control_imbuf(Brush *br)
Did some refactoring with brush and sculpt to make radial control easier to add to other modes.
2009-01-25 07:28:11 +00:00
{
ImBuf *im = MEM_callocN(sizeof(ImBuf), "radial control texture");
unsigned int *texcache;
int side = 128;
int half = side / 2;
int i, j;
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
texcache = BKE_brush_gen_texture_cache(br, half);
Did some refactoring with brush and sculpt to make radial control easier to add to other modes.
2009-01-25 07:28:11 +00:00
im->rect_float = MEM_callocN(sizeof(float) * side * side, "radial control rect");
im->x = im->y = side;
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < side; ++i) {
for (j = 0; j < side; ++j) {
code cleanup: double promotion warnings
2012-05-22 21:16:59 +00:00
float magn = sqrtf(powf(i - half, 2) + powf(j - half, 2));
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
im->rect_float[i * side + j] = BKE_brush_curve_strength_clamp(br, magn, half);
Did some refactoring with brush and sculpt to make radial control easier to add to other modes.
2009-01-25 07:28:11 +00:00
}
}
/* Modulate curve with texture */
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
if (texcache) {
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
for (i = 0; i < side; ++i) {
for (j = 0; j < side; ++j) {
const int col = texcache[i * side + j];
im->rect_float[i * side + j] *= (((char *)&col)[0] + ((char *)&col)[1] + ((char *)&col)[2]) / 3.0f / 255.0f;
Did some refactoring with brush and sculpt to make radial control easier to add to other modes.
2009-01-25 07:28:11 +00:00
}
* Brought back special normal recalc for sculpt (only recalculates modified faces/verts) * Means that full object recalc isn't done, so multires works more as expected now * Moved mesh element cache back to sculpt session (from sculpt cache), really makes more sense there
2009-01-29 03:50:46 +00:00
}
Did some refactoring with brush and sculpt to make radial control easier to add to other modes.
2009-01-25 07:28:11 +00:00
* Brought back special normal recalc for sculpt (only recalculates modified faces/verts) * Means that full object recalc isn't done, so multires works more as expected now * Moved mesh element cache back to sculpt session (from sculpt cache), really makes more sense there
2009-01-29 03:50:46 +00:00
MEM_freeN(texcache);
}
ImagePaint Refactoring: - ImagePaint now uses ImBuf directly, and the rect blending functions were moved into the imbuf module. - The brush spacing, timing and sampling was abstracted into brush.c, for later reuse in other paint modes. Float ImagePaint support. Textured Brushes: - Only the first texture channel is used now. - Options for size and offset should be added, but need to find some space in the panel, or add a second one ..
2006-07-31 15:53:03 +00:00
Did some refactoring with brush and sculpt to make radial control easier to add to other modes.
2009-01-25 07:28:11 +00:00
return im;
}
Copy Permalink