Commit d375470c authored by Jan Möbius's avatar Jan Möbius
Browse files

More build errors

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19985 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 444c94f8
......@@ -132,7 +132,7 @@ draw(GLState& _state , const DrawModes::DrawMode& _drawMode)
glColor4f(0.0f,1.0f,0.0f,1.0f);
box_->draw();
box_->draw_primitive();
_state.pop_modelview_matrix();
glPopAttrib ();
......
......@@ -911,7 +911,7 @@ void TranslationManipulatorNode::addManipulatorToRenderer (IRenderer* _renderer,
for (int i = 0; i < 3; ++i)
_baseRO->emissive[i] = _active ? (element_[XRing].active_current_color_[i]) : (element_[XRing].inactive_current_color_[i]);
circle_->addToRenderer(_renderer, _baseRO);
circle_->addToRenderer_primitive(_renderer, _baseRO);
}
......@@ -920,7 +920,7 @@ void TranslationManipulatorNode::addManipulatorToRenderer (IRenderer* _renderer,
{
for (int i = 0; i < 3; ++i)
_baseRO->emissive[i] = _active ? (element_[YRing].active_current_color_[i]) : (element_[YRing].inactive_current_color_[i]);
circle_->addToRenderer(_renderer, _baseRO);
circle_->addToRenderer_primitive(_renderer, _baseRO);
}
_baseRO->modelview.rotate(90, 1.0, 0.0, 0.0);
......@@ -928,7 +928,7 @@ void TranslationManipulatorNode::addManipulatorToRenderer (IRenderer* _renderer,
{
for (int i = 0; i < 3; ++i)
_baseRO->emissive[i] = _active ? (element_[ZRing].active_current_color_[i]) : (element_[ZRing].inactive_current_color_[i]);
circle_->addToRenderer(_renderer, _baseRO);
circle_->addToRenderer_primitive(_renderer, _baseRO);
}
_baseRO->modelview = oldModelview;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment