Commit 3389221c authored by Jan Möbius's avatar Jan Möbius

More warnings fixed

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@16351 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 7d2176be
......@@ -181,9 +181,11 @@ void ObjectPickDialog::slotMouseEventClick(QMouseEvent * _event, bool /*_double*
{
unsigned int nodeIdx, targetIdx;
BaseObjectData *obj;
if (viewer_->viewer()->pick(ACG::SceneGraph::PICK_ANYTHING, _event->pos(), nodeIdx, targetIdx))
{
BaseObjectData *obj;
if (PluginFunctions::getPickedObject (nodeIdx, obj))
{
if (!obj->flag ("vsi_objectId_disabled"))
......@@ -205,10 +207,12 @@ unsigned int VSI::ObjectPickDialog::selectedId()
void VSI::ObjectPickDialog::selectedId(unsigned int _id)
{
BaseObject *obj = 0, *obj2 = 0;
BaseObject *obj = 0;
if (PluginFunctions::getObject(_id, obj))
{
BaseObject* obj2 = 0;
if (selectedId_ != _id && PluginFunctions::getObject(selectedId_, obj2))
{
obj2->setFlag ("vsi_objectId_selected", false);
......
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