#4045 Don't accept pick events if the current selected object isn't the object owning the pick handler.

This commit is contained in:
Gaute Lindkvist
2019-02-06 13:20:33 +01:00
parent dbe21b7809
commit c4f5065032
13 changed files with 98 additions and 17 deletions

View File

@@ -40,7 +40,7 @@
///
//--------------------------------------------------------------------------------------------------
RicPolylineTargetsPickEventHandler::RicPolylineTargetsPickEventHandler(RimUserDefinedPolylinesAnnotation* polylineDef)
: m_polylineDef(polylineDef)
: Ric3dViewPickEventHandler(polylineDef), m_polylineDef(polylineDef)
{
}
@@ -62,7 +62,7 @@ void RicPolylineTargetsPickEventHandler::notifyUnregistered()
//--------------------------------------------------------------------------------------------------
bool RicPolylineTargetsPickEventHandler::handle3dPickEvent(const Ric3dPickEvent& eventObject)
{
if (!caf::SelectionManager::instance()->isSelected(m_polylineDef.p(), 0))
if (!isObjectBeingModified(caf::SelectionManager::instance()->selectedItemOfType<caf::PdmObjectHandle>()))
{
return false;
}