[Bf-blender-cvs] [6822e353ffa] blender2.8: Merge branch 'master' into blender2.8

Sybren A. Stüvel noreply at git.blender.org
Tue Apr 25 17:07:49 CEST 2017


Commit: 6822e353ffa90e1fe8290b243b1bc2c43d5d157a
Author: Sybren A. Stüvel
Date:   Tue Apr 25 17:04:17 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB6822e353ffa90e1fe8290b243b1bc2c43d5d157a

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc source/blender/editors/uvedit/uvedit_draw.c
index 3149abc338b,15be6ab3b78..16d430c9421
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@@ -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;




More information about the Bf-blender-cvs mailing list