Sfoglia il codice sorgente

Merge pull request #1275 from Azaezel/alpha41/collideCrash

work around collide not returning false with a null object
Brian Roberts 1 anno fa
parent
commit
b6f250e93c
1 ha cambiato i file con 2 aggiunte e 2 eliminazioni
  1. 2 2
      Engine/source/gui/worldEditor/worldEditor.cpp

+ 2 - 2
Engine/source/gui/worldEditor/worldEditor.cpp

@@ -1999,7 +1999,7 @@ void WorldEditor::on3DMouseMove(const Gui3DMouseEvent & event)
    if ( !mHitObject )
    {
       SceneObject *hitObj = NULL;
-      if ( collide(event, &hitObj) && !hitObj->isDeleted() && hitObj->isSelectionEnabled() && !objClassIgnored(hitObj) )
+      if ( collide(event, &hitObj) && hitObj && !hitObj->isDeleted() && hitObj->isSelectionEnabled() && !objClassIgnored(hitObj) )
       {
          mHitObject = hitObj;
       }
@@ -2060,7 +2060,7 @@ void WorldEditor::on3DMouseDown(const Gui3DMouseEvent & event)
    }   
 
    SceneObject *hitObj = NULL;
-   if ( collide( event, &hitObj ) && hitObj->isSelectionEnabled() && !objClassIgnored( hitObj ) )
+   if ( collide( event, &hitObj ) && hitObj && hitObj->isSelectionEnabled() && !objClassIgnored( hitObj ) )
    {
       mPossibleHitObject = hitObj;
       mNoMouseDrag = true;