diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-20 23:27:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-20 23:27:27 +0400 |
| commit | 23f69cbe92bec250a1b850d379d921c34ecfd6a7 (patch) | |
| tree | 6aafcea8620540e81882c50e589cbde44d67f418 /source/blender/blenkernel/intern/paint.c | |
| parent | 5240d39e48f97d032853da63377de23db36d657d (diff) | |
move G_FACESELECT from G.f to mesh->editflag, renamed to ME_EDIT_PAINT_MASK
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index f17d2fbdcac..9a8f6d284f3 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -29,6 +29,7 @@ #include "DNA_brush_types.h" #include "DNA_object_types.h" +#include "DNA_mesh_types.h" #include "DNA_scene_types.h" #include "BKE_brush.h" @@ -160,8 +161,7 @@ void paint_brush_slot_remove(Paint *p) int paint_facesel_test(Object *ob) { - return (G.f&G_FACESELECT) && (ob && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))); - + return (ob && (((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_MASK) && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))); } void paint_init(Paint *p, const char col[3]) |