[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36016] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: fix for render only drawing wire curves in wire view.

[Campbell Barton]

Revision: 36016
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36016
Author:   campbellbarton
Date:     2011-04-05 07:26:22 +0000 (Tue, 05 Apr 2011)
Log Message:
-----------
fix for render only drawing wire curves in wire view.

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

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c      
2011-04-05 07:13:23 UTC (rev 36015)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c      
2011-04-05 07:26:22 UTC (rev 36016)
@@ -3141,9 +3141,9 @@
        ListBase *lb=NULL;
        DispList *dl;
        Curve *cu;
-       int solid, retval= 0;
-       
-       solid= (dt > OB_WIRE);
+       const short render_only= (v3d->flag2 & V3D_RENDER_OVERRIDE);
+       const short solid= (dt > OB_WIRE);
+       int retval= 0;
 
        if (drawCurveDerivedMesh(scene, v3d, rv3d, base, dt) == 0) {
                return 0;
@@ -3164,7 +3164,7 @@
                        index3_nors_incr= 0;
                        
                        if( displist_has_faces(lb)==0) {
-                               if((v3d->flag2 & V3D_RENDER_OVERRIDE)==0) {
+                               if(!render_only) {
                                        draw_index_wire= 0;
                                        drawDispListwire(lb);
                                        draw_index_wire= 1;
@@ -3196,9 +3196,11 @@
                        index3_nors_incr= 1;
                }
                else {
-                       draw_index_wire= 0;
-                       retval= drawDispListwire(lb);
-                       draw_index_wire= 1;
+                       if(!render_only || (render_only && 
displist_has_faces(lb))) {
+                               draw_index_wire= 0;
+                               retval= drawDispListwire(lb);
+                               draw_index_wire= 1;
+                       }
                }
                break;
        case OB_SURF:

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