[Bf-blender-cvs] [188c4a22c98] master: Cleanup: de-duplicate paint access from object
Campbell Barton
noreply at git.blender.org
Mon Apr 30 18:59:08 CEST 2018
Commit: 188c4a22c98fb68377b881e5e20ac759ff329d85
Author: Campbell Barton
Date: Mon Apr 30 18:58:43 2018 +0200
Branches: master
https://developer.blender.org/rB188c4a22c98fb68377b881e5e20ac759ff329d85
Cleanup: de-duplicate paint access from object
===================================================================
M source/blender/blenkernel/intern/paint.c
===================================================================
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index bee6e7d3df0..144ec029db1 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -208,27 +208,8 @@ Paint *BKE_paint_get_active_from_context(const bContext *C)
return &ts->imapaint.paint;
}
}
- else if (obact) {
- switch (obact->mode) {
- case OB_MODE_SCULPT:
- return &ts->sculpt->paint;
- case OB_MODE_VERTEX_PAINT:
- return &ts->vpaint->paint;
- case OB_MODE_WEIGHT_PAINT:
- return &ts->wpaint->paint;
- case OB_MODE_TEXTURE_PAINT:
- return &ts->imapaint.paint;
- case OB_MODE_EDIT:
- if (ts->use_uv_sculpt)
- return &ts->uvsculpt->paint;
- return &ts->imapaint.paint;
- default:
- return &ts->imapaint.paint;
- }
- }
else {
- /* default to image paint */
- return &ts->imapaint.paint;
+ return BKE_paint_get_active(sce);
}
}
More information about the Bf-blender-cvs
mailing list