Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 25 Apr 2017 15:04:17 +0000 (17:04 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 25 Apr 2017 15:04:17 +0000 (17:04 +0200)
1  2 
source/blender/alembic/intern/abc_mesh.cc
source/blender/alembic/intern/abc_object.cc
source/blender/alembic/intern/alembic_capi.cc
source/blender/editors/uvedit/uvedit_draw.c
source/blender/windowmanager/intern/wm_files.c
tests/python/bl_alembic_import_test.py

index 3149abc338baeb6a742ed29974d2a8fec81db9d9,15be6ab3b78c2a31d9491284e3d476ee8fb6d866..16d430c942156beeedb0707ba9c0d57a4f8bf096
@@@ -548,12 -495,14 +548,12 @@@ static void draw_uvs_texpaint(SpaceImag
        Material *ma;
  
        if (sima->flag & SI_DRAW_OTHER) {
 -              draw_uvs_other(scene, ob, curimage, new_shading_nodes, sima->other_uv_filter);
 +              draw_uvs_other(sl, ob, curimage, new_shading_nodes, sima->other_uv_filter);
        }
  
 -      UI_ThemeColor(TH_UV_SHADOW);
 -
        ma = give_current_material(ob, ob->actcol);
  
-       if (me->mtpoly) {
+       if (me->mloopuv) {
                MPoly *mpoly = me->mpoly;
                MLoopUV *mloopuv, *mloopuv_base;
                int a, b;