diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-07-27 02:29:23 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-07-27 02:29:23 +0400 |
commit | 4ee3515bf1751f7f89168f3c5c1fd907ad138ffd (patch) | |
tree | acc86233c0d49317c74a239a6280dfe9e0a266cc /source/blender/src/headerbuttons.c | |
parent | 6a087fcb8b817d53f9689c300dc4002de8150a19 (diff) |
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.
Diffstat (limited to 'source/blender/src/headerbuttons.c')
-rw-r--r-- | source/blender/src/headerbuttons.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c index 3440b5b0c18..3ec3a58f9b3 100644 --- a/source/blender/src/headerbuttons.c +++ b/source/blender/src/headerbuttons.c @@ -251,7 +251,7 @@ int std_libbuttons(uiBlock *block, short xco, short yco, if(browse) { char *extrastr= NULL; - if(ELEM(id_code, ID_MA, ID_TE)) add_addbutton= 1; + if(ELEM3(id_code, ID_MA, ID_TE, ID_BR)) add_addbutton= 1; lb= wich_libbase(G.main, id_code); @@ -261,7 +261,7 @@ int std_libbuttons(uiBlock *block, short xco, short yco, uiBlockSetCol(block, TH_BUT_SETTING2); } - if ELEM7( id_code, ID_SCE, ID_SCR, ID_MA, ID_TE, ID_WO, ID_IP, ID_AC) extrastr= "ADD NEW %x 32767"; + if ELEM8( id_code, ID_SCE, ID_SCR, ID_MA, ID_TE, ID_WO, ID_IP, ID_AC, ID_BR) extrastr= "ADD NEW %x 32767"; else if (id_code==ID_TXT) extrastr= "OPEN NEW %x 32766 |ADD NEW %x 32767"; else if (id_code==ID_SO) extrastr= "OPEN NEW %x 32766"; |