diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2016-02-02 09:37:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2016-02-02 09:39:40 +0300 |
| commit | be10d6d3f046cc628824c372dd5f96d17cc95dbc (patch) | |
| tree | faed4e59fb96501e3e07d1f4d34681a0b737d504 /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 9afab7098519e5044664580dc1c3117918549383 (diff) | |
Cleanup: rename uvflag -> flag for dm drawing
Was called both, however this isn't mainly for uv's so just call 'flag'.
Also remove redundant NULL check.
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 5ded3a9518d..039cc747a92 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -971,18 +971,18 @@ static void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH | DM_DRAW_SKIP_HIDDEN); } else { - DMDrawFlag uvflag; + DMDrawFlag dm_draw_flag; drawTFace_userData userData; if (ob->mode & OB_MODE_TEXTURE_PAINT) { - uvflag = DM_DRAW_USE_TEXPAINT_UV; + dm_draw_flag = DM_DRAW_USE_TEXPAINT_UV; } else { - uvflag = DM_DRAW_USE_ACTIVE_UV; + dm_draw_flag = DM_DRAW_USE_ACTIVE_UV; } if ((ob->mode & OB_MODE_SCULPT) && (ob == OBACT)) { - uvflag |= DM_DRAW_SKIP_HIDDEN; + dm_draw_flag |= DM_DRAW_SKIP_HIDDEN; } @@ -994,7 +994,7 @@ static void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d dm->drawMappedFacesTex( dm, me->mpoly ? draw_tface_mapped__set_draw : NULL, compareDrawOptions, - &userData, uvflag); + &userData, dm_draw_flag); } else { userData.me = NULL; @@ -1002,7 +1002,7 @@ static void draw_mesh_textured_old(Scene *scene, View3D *v3d, RegionView3D *rv3d update_tface_color_layer(dm, !(ob->mode & OB_MODE_TEXTURE_PAINT)); dm->drawFacesTex( dm, draw_tface__set_draw, compareDrawOptions, - &userData, uvflag); + &userData, dm_draw_flag); } } |