[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60753] trunk/blender/source/blender/ editors/space_view3d/drawmesh.c: Fix cycles textured draw mode problem with objects that have an image texture

[Brecht Van Lommel]

Revision: 60753
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60753
Author:   blendix
Date:     2013-10-14 19:37:12 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
Fix cycles textured draw mode problem with objects that have an image texture
but not UV coordinates, it would show a different color with the object selected
and deselected.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawmesh.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2013-10-14 19:36:47 UTC (rev 60752)
+++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c	2013-10-14 19:37:12 UTC (rev 60753)
@@ -976,8 +976,8 @@
 
 		GPU_begin_object_materials(v3d, rv3d, scene, ob, glsl, NULL);
 
-		if (glsl || picking) {
-			/* draw glsl */
+		if (glsl || picking || !CustomData_has_layer(&dm->loopData, CD_MLOOPUV)) {
+			/* draw glsl or solid */
 			dm->drawMappedFacesMat(dm,
 			                       tex_mat_set_material_cb,
 			                       set_face_cb, &data);