diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 03:44:51 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-07 03:52:14 +0300 |
commit | 59e70d5f8d68d8fa9eb34f75866578fafece8709 (patch) | |
tree | cdc1181a56429075c80abf36f0e70578c8f30795 /source/blender/blenkernel | |
parent | 81e2515a0460a6b090e28efab50d95de390043c6 (diff) |
Cleanup: renmae ePaintTexture(Projective) -> 3D
Matches ePaintTexture2D, less verbose.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_paint.h | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/paint.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h index abb9000b024..a132af41567 100644 --- a/source/blender/blenkernel/BKE_paint.h +++ b/source/blender/blenkernel/BKE_paint.h @@ -69,9 +69,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, ePaintInvalid = 6 diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 2c17fa44229..0541bd58c85 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -142,7 +142,7 @@ Paint *BKE_paint_get_active_from_paintmode(Scene *sce, ePaintMode mode) case ePaintWeight: return &ts->wpaint->paint; case ePaintTexture2D: - case ePaintTextureProjective: + case ePaintTexture3D: return &ts->imapaint.paint; case ePaintSculptUV: return &ts->uvsculpt->paint; @@ -248,7 +248,7 @@ ePaintMode BKE_paintmode_get_active_from_context(const bContext *C) case OB_MODE_WEIGHT_PAINT: return ePaintWeight; case OB_MODE_TEXTURE_PAINT: - return ePaintTextureProjective; + return ePaintTexture3D; case OB_MODE_EDIT: if (ts->use_uv_sculpt) return ePaintSculptUV; @@ -486,7 +486,7 @@ eObjectMode BKE_paint_object_mode_from_paint_mode(ePaintMode mode) return OB_MODE_VERTEX_PAINT; case ePaintWeight: return OB_MODE_WEIGHT_PAINT; - case ePaintTextureProjective: + case ePaintTexture3D: return OB_MODE_TEXTURE_PAINT; case ePaintTexture2D: return OB_MODE_TEXTURE_PAINT; |