X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=5811b84d195a7afc82853e22bea6ee0570319d64;hb=32316772d422223827833366a7ee2d0a76d76ff1;hp=ba7e669134766ace8b7bc93ce5c2331e9684fad0;hpb=ec1f75d72e5c4f7f7c9dafdf80f58c30ffb1a855;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index ba7e669..5811b84 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -138,6 +138,7 @@ Designer::Designer(int argc, char **argv): pipeline->add_renderable_for_pass(*track_wrap, "unlit"); overlay = new Overlay3D(ui_res.get_default_font()); pipeline->add_renderable_for_pass(*overlay, "overlay"); + pipeline->add_renderable_for_pass(measure, "unlit"); camera_ctl = new CameraController(*main_view, keyboard, mouse); cat_view->get_camera().set_look_direction(GL::Vector3(0, 0.13053, -0.99144)); @@ -508,11 +509,6 @@ void Designer::render() View3D *view = (mode==CATALOGUE ? cat_view : main_view); view->render(); - if(mode==MEASURE) - { - GL::Bind bind_depth(GL::DepthTest::lequal()); - measure.render(); - } root.render(); // XXX Should fix GLtk so this would not be needed