diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-04-05 11:26:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-05 11:26:22 +0400 |
| commit | 8f4343cb304af865a35c5a02f648fb38a1044a2f (patch) | |
| tree | 25ea1c0f9389f4c85c30f11e24d9e51dcf861549 /source/blender/editors/space_view3d | |
| parent | 2b90eb18e2dc4338263f3a1d90b04a6354a1815b (diff) | |
fix for render only drawing wire curves in wire view.
Diffstat (limited to 'source/blender/editors/space_view3d')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index cf7ca95b93c..ed9d6f77ffa 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -3141,9 +3141,9 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas 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 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas 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 @@ static int drawDispList(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *bas 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: |