diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-27 13:59:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-27 14:47:40 +0300 |
| commit | 67fe5726af06740747c7d33e75d9f0d9324a2d17 (patch) | |
| tree | 879186fd5dd33d930e92925100390e619fcea5c7 /source/blender/editors | |
| parent | 15676bcc85d8ef4c4083643e3ff8b13661de52de (diff) | |
Use loop data instead of face data
Replace checks in various places
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index cafc773c48c..23f388d2a58 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -83,8 +83,8 @@ static bool vertex_paint_use_fast_update_check(Object *ob) if (dm) { Mesh *me = BKE_mesh_from_object(ob); - if (me && me->mcol) { - return (me->mcol == CustomData_get_layer(&dm->faceData, CD_MCOL)); + if (me && me->mloopcol) { + return (me->mloopcol == CustomData_get_layer(&dm->loopData, CD_MLOOPCOL)); } } diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 3e5374f7d31..0f4e05c230b 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -2619,7 +2619,7 @@ CustomDataMask ED_view3d_datamask(const Scene *scene, const View3D *v3d) if (ELEM(v3d->drawtype, OB_TEXTURE, OB_MATERIAL) || ((v3d->drawtype == OB_SOLID) && (v3d->flag2 & V3D_SOLID_TEX))) { - mask |= CD_MASK_MTFACE | CD_MASK_MCOL; + mask |= CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL; if (BKE_scene_use_new_shading_nodes(scene)) { if (v3d->drawtype == OB_MATERIAL) |