[Bf-blender-cvs] [f125789] soc-2013-paint: Reuse old regular drawing even in cycles for non-material mode in texture paint. This enables us to see stencil masking even then.
Antony Riakiotakis
noreply at git.blender.org
Sat May 3 00:11:16 CEST 2014
Commit: f1257899454be2bb734a957698003240449fc057
Author: Antony Riakiotakis
Date: Sat May 3 01:03:54 2014 +0300
https://developer.blender.org/rBf1257899454be2bb734a957698003240449fc057
Reuse old regular drawing even in cycles for non-material mode in
texture paint. This enables us to see stencil masking even then.
===================================================================
M 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 973f6a3..d2c6b42 100644
--- a/source/blender/editors/space_view3d/drawmesh.c
+++ b/source/blender/editors/space_view3d/drawmesh.c
@@ -1012,8 +1012,9 @@ static bool tex_mat_set_face_editmesh_cb(void *userData, int index)
void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Object *ob, DerivedMesh *dm, const int draw_flags)
{
- /* if not cycles, or preview-modifiers, or drawing matcaps */
- if ((!BKE_scene_use_new_shading_nodes(scene)) || (draw_flags & DRAW_MODIFIERS_PREVIEW) || (v3d->flag2 & V3D_SHOW_SOLID_MATCAP)) {
+ /* if not cycles, or preview-modifiers, or drawing matcaps or texture paint */
+ if ((!BKE_scene_use_new_shading_nodes(scene)) || (draw_flags & DRAW_MODIFIERS_PREVIEW) || (v3d->flag2 & V3D_SHOW_SOLID_MATCAP) ||
+ ((ob->mode & OB_MODE_TEXTURE_PAINT) && ELEM(v3d->drawtype, OB_TEXTURE, OB_SOLID))) {
draw_mesh_textured_old(scene, v3d, rv3d, ob, dm, draw_flags);
return;
}
More information about the Bf-blender-cvs
mailing list