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/intern/paint.c | |
| parent | 4e9911663a22766f6751d33ae84c1ebcc1fae559 (diff) | |
| parent | 59e70d5f8d68d8fa9eb34f75866578fafece8709 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index db7cd513bf4..e31021d7d48 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -158,7 +158,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; @@ -184,7 +184,7 @@ const EnumPropertyItem *BKE_paint_get_tool_enum_from_paintmode(ePaintMode mode) case ePaintWeight: return rna_enum_brush_weight_tool_items; case ePaintTexture2D: - case ePaintTextureProjective: + case ePaintTexture3D: return rna_enum_brush_image_tool_items; case ePaintSculptUV: return NULL; @@ -203,7 +203,7 @@ const char *BKE_paint_get_tool_prop_id_from_paintmode(ePaintMode mode) case ePaintVertex: return "vertex_tool"; case ePaintWeight: return "weight_tool"; case ePaintTexture2D: - case ePaintTextureProjective: return "image_tool"; + case ePaintTexture3D: return "image_tool"; case ePaintGpencil: return "gpencil_tool"; default: /* invalid paint mode */ @@ -309,7 +309,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; @@ -340,7 +340,7 @@ ePaintMode BKE_paintmode_get_from_tool(const struct bToolRef *tref) case CTX_MODE_GPENCIL_PAINT: return ePaintGpencil; case CTX_MODE_PAINT_TEXTURE: - return ePaintTextureProjective; + return ePaintTexture3D; } } else if (tref->space_type == SPACE_IMAGE) { @@ -405,7 +405,7 @@ uint BKE_paint_get_brush_tool_offset_from_paintmode(const ePaintMode mode) { switch (mode) { case ePaintTexture2D: - case ePaintTextureProjective: + case ePaintTexture3D: return offsetof(Brush, imagepaint_tool); case ePaintSculpt: return offsetof(Brush, sculpt_tool); @@ -627,7 +627,7 @@ eObjectMode BKE_paint_object_mode_from_paintmode(ePaintMode mode) case ePaintWeight: return OB_MODE_WEIGHT_PAINT; case ePaintTexture2D: - case ePaintTextureProjective: + case ePaintTexture3D: return OB_MODE_TEXTURE_PAINT; case ePaintSculptUV: return OB_MODE_EDIT; |