[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56131] trunk/blender/source/blender/ editors/space_view3d: Fix #34970: in glsl mode the vertex paint face mask is not visible

[Sergey Sharybin]

Revision: 56131
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56131
Author:   nazgul
Date:     2013-04-18 10:39:53 +0000 (Thu, 18 Apr 2013)
Log Message:
-----------
Fix #34970: in glsl mode the vertex paint face mask is not visible

Added face selection code to GLSL draw. We do this for Cycles
already, shall behave expected now.

Checked by Ton, thanks!

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

Modified: trunk/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawmesh.c        
2013-04-18 10:22:42 UTC (rev 56130)
+++ trunk/blender/source/blender/editors/space_view3d/drawmesh.c        
2013-04-18 10:39:53 UTC (rev 56131)
@@ -180,7 +180,7 @@
                return DM_DRAW_OPTION_SKIP;
 }
 
-static void draw_mesh_face_select(RegionView3D *rv3d, Mesh *me, DerivedMesh 
*dm)
+void draw_mesh_face_select(RegionView3D *rv3d, Mesh *me, DerivedMesh *dm)
 {
        drawMeshFaceSelect_userData data;
 

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c      
2013-04-18 10:22:42 UTC (rev 56130)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c      
2013-04-18 10:39:53 UTC (rev 56131)
@@ -3262,6 +3262,9 @@
                        GPU_disable_material();
 
                        glFrontFace(GL_CCW);
+
+                       if (draw_flags & DRAW_FACE_SELECT)
+                               draw_mesh_face_select(rv3d, me, dm);
                }
                else {
                        draw_mesh_textured(scene, v3d, rv3d, ob, dm, 
draw_flags);

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_intern.h   
2013-04-18 10:22:42 UTC (rev 56130)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_intern.h   
2013-04-18 10:39:53 UTC (rev 56131)
@@ -47,6 +47,7 @@
 struct bMotionPath;
 struct bPoseChannel;
 struct bScreen;
+struct Mesh;
 struct wmNDOFMotionData;
 struct wmOperatorType;
 struct wmWindowManager;
@@ -148,6 +149,7 @@
 /* drawmesh.c */
 void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d,
                         struct Object *ob, struct DerivedMesh *dm, const int 
draw_flags);
+void draw_mesh_face_select(struct RegionView3D *rv3d, struct Mesh *me, struct 
DerivedMesh *dm);
 void draw_mesh_paint(View3D *v3d, RegionView3D *rv3d,
                      struct Object *ob, struct DerivedMesh *dm, const int 
draw_flags);
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs