diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 03:58:57 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 03:59:41 +0300 |
commit | 101fd08348e5717f98af93481e6cc97d3bf920c3 (patch) | |
tree | 32a8130570ed435290656f48c7af8bfde7e96532 /source/blender/blenkernel/BKE_paint.h | |
parent | 4e9911663a22766f6751d33ae84c1ebcc1fae559 (diff) | |
parent | 59e70d5f8d68d8fa9eb34f75866578fafece8709 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_paint.h')
-rw-r--r-- | source/blender/blenkernel/BKE_paint.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index b4b667ecb6b..6f54e2b3b17 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -76,9 +76,12 @@ extern const char PAINT_CURSOR_TEXTURE_PAINT[3]; typedef enum ePaintMode { ePaintSculpt = 0, + /** Vertex color. */ ePaintVertex = 1, ePaintWeight = 2, - ePaintTextureProjective = 3, + /** 3D view (projection painting). */ + ePaintTexture3D = 3, + /** Image space (2D painting). */ ePaintTexture2D = 4, ePaintSculptUV = 5, ePaintGpencil = 6, |