diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-02-11 17:07:04 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-02-11 17:07:24 +0300 |
| commit | f7e131a6acd800a311e50b680e5be6d9824a1df7 (patch) | |
| tree | 30cbe9ff93d0e59d806df735a83ba0f3d4df99a1 /source/blender/makesdna/DNA_scene_types.h | |
| parent | b7bac19acaa41567967a43ae8aa8756e23f27a83 (diff) | |
Cavity masking - add curve control to cavity mask and move relevant
structs to paint struct (might be useful for vertex paint too in the
future)
Cavity masking now has a curve control. The control will set the amount
of masking for positive cavity ("pointness") or negative cavity
("cavity") with x axis being the amount of cavity and 0.0 = full cavity,
1.0 = full pointness, 0.5 = no cavity and the y axis being the amount of
alpha.
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index d3fa9c82d39..2d2ee4ab309 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -47,6 +47,7 @@ extern "C" { #include "DNA_ID.h" #include "DNA_freestyle_types.h" +struct CurveMapping; struct Object; struct Brush; struct World; @@ -813,6 +814,7 @@ typedef struct TimeMarker { typedef struct Paint { struct Brush *brush; struct Palette *palette; + struct CurveMapping *cavity_curve; /* cavity curve */ /* WM Paint cursor */ void *paint_cursor; @@ -850,8 +852,6 @@ typedef struct ImagePaintSettings { struct Image *canvas; /* canvas when the explicit system is used for painting */ float stencil_col[3]; float dither; /* dither amount used when painting on byte images */ - float cavity_mul; - float pad; } ImagePaintSettings; /* ------------------------------------------- */ @@ -1695,7 +1695,8 @@ enum { typedef enum { PAINT_SHOW_BRUSH = (1 << 0), PAINT_FAST_NAVIGATE = (1 << 1), - PAINT_SHOW_BRUSH_ON_SURFACE = (1 << 2) + PAINT_SHOW_BRUSH_ON_SURFACE = (1 << 2), + PAINT_USE_CAVITY_MASK = (1 << 3) } PaintFlags; /* Paint.symmetry_flags @@ -1762,8 +1763,6 @@ typedef enum ImagePaintMode { #define IMAGEPAINT_PROJECT_LAYER_CLONE (1 << 7) #define IMAGEPAINT_PROJECT_LAYER_STENCIL (1 << 8) #define IMAGEPAINT_PROJECT_LAYER_STENCIL_INV (1 << 9) -#define IMAGEPAINT_PROJECT_CAVITY (1 << 10) -#define IMAGEPAINT_PROJECT_CAVITY_INV (1 << 11) #define IMAGEPAINT_MISSING_UVS (1 << 0) |