Commits

Philip Allgaier  committed 6a7a6a3

- changed terrain notifications to be more acurate

  • Participants
  • Parent commits 5612930

Comments (0)

Files changed (3)

File CMakeLists.txt

     OGITOR_LIBOGREOFSPLUGIN_PATH
 )
 
-# Error ouot if old Media folder is detected
+# Error out if old Media folder is detected
 if(UNIX AND IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/RunPath/Media/EditorResources)
   message(SEND_ERROR "An old version of the Media folder was detected in: ${CMAKE_CURRENT_SOURCE_DIR}/RunPath .\nMake sure that you've downloaded the latest version of 'media.zip' from Ogitor.org and extracted it into ${CMAKE_CURRENT_SOURCE_DIR}/RunPath as 'Media'.")
 endif()

File Ogitor/src/TerrainGroupEditorEditing.cpp

         mDecalFrustum->setNearClipDistance(ratio);
         mDecalFrustum->setOrthoWindow(ratio, ratio);
         
-        setBrushName(mBrushName);
+        //setBrushName(mBrushName);
     }
 }
 //-----------------------------------------------------------------------------------------

File Ogitor/src/TerrainGroupEditorUpdate.cpp

 
     mLayer = handle->_getLayerID(mTextureDiffuse, mTextureNormal, mEditDirection);
 
-    if(mLayer < 1)
+    if(mLayer == -1)
     {
-        Ogre::String msg = handle->getName() + " already has maximum number of supported layers...";
+        Ogre::String msg = handle->getName() + " already has the maximum number of supported texture layers.";
+        mSystem->DisplayMessageDialog(OTR(msg), DLGTYPE_OK);
+        return;
+    }
+    else if(mLayer == 0)
+    {
+        Ogre::String msg = "You cannot use that texture pn " + handle->getName() + " since that is already the texture of the base layer.";
         mSystem->DisplayMessageDialog(OTR(msg), DLGTYPE_OK);
         return;
     }