diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-25 20:51:16 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-25 20:51:16 +0300 |
| commit | 55d2a56d6020a5d286d5d44f7d2d8a8d0bc9bf58 (patch) | |
| tree | 959cb7abcf1ab92caa28fa5a5156520f08f9936d /source/blender/blenkernel/intern/paint.c | |
| parent | 077edbb384e3845f27cc06618046a08c7101cc4c (diff) | |
| parent | f1fa79a59554cb36ebee0a569a7b0f442fef6646 (diff) | |
Sculpt:
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r24483:24889
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
| -rw-r--r-- | source/blender/blenkernel/intern/paint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 5cc2190c088..4fe63a966be 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -161,7 +161,7 @@ void paint_brush_slot_remove(Paint *p) int paint_facesel_test(Object *ob) { - return (ob && ob->data && (((Mesh *)ob->data)->editflag & ME_EDIT_PAINT_MASK) && (ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT))); + return (ob && ob->type==OB_MESH && ob->data && (((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]) |