From 6e66ddf5ed29c2593dbd25d4fd48b36c2e68e411 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 11 Oct 2015 01:44:47 +0200 Subject: Fix warnings and remove casts by adding copy_vx_vx_uchar() functions. --- source/blender/editors/space_view3d/drawmesh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/space_view3d/drawmesh.c') diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index d806dfa015a..c40330a2f23 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -664,7 +664,7 @@ static void update_tface_color_layer(DerivedMesh *dm, bool use_mcol) else if (ma && (ma->shade_flag & MA_OBCOLOR)) { int loop_index = mp->loopstart; for (j = 0; j < mp->totloop; j++, loop_index++) { - copy_v3_v3_char(&finalCol[loop_index].r, (char *)Gtexdraw.obcol); + copy_v3_v3_uchar(&finalCol[loop_index].r, Gtexdraw.obcol); } copy_mode = COPY_PREV; } -- cgit v1.2.3 From 904db487a7b14c31282fe0284612159a836657cd Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 14 Oct 2015 16:21:01 +1100 Subject: Fix T46284: Texture paint, wrong shading mode Project-paint now supports painting to cycles materials. --- source/blender/editors/space_view3d/drawmesh.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source/blender/editors/space_view3d/drawmesh.c') diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index c40330a2f23..68e536662d6 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -1114,8 +1114,7 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, /* if not cycles, or preview-modifiers, or drawing matcaps */ if ((draw_flags & DRAW_MODIFIERS_PREVIEW) || (v3d->flag2 & V3D_SHOW_SOLID_MATCAP) || - (BKE_scene_use_new_shading_nodes(scene) == false) || - ((ob->mode & OB_MODE_TEXTURE_PAINT) && ELEM(v3d->drawtype, OB_TEXTURE, OB_SOLID))) + (BKE_scene_use_new_shading_nodes(scene) == false)) { draw_mesh_textured_old(scene, v3d, rv3d, ob, dm, draw_flags); return; -- cgit v1.2.3