Merge remote-tracking branch 'origin/master'

apps/openmw/mwmechanics/actors.cpp

@@ -1255,7 +1255,7 @@ namespace MWMechanics
         }
         else
         {
-            std::cerr<< "Error in Actors::playAnimationGroup:  Unable to find " << ptr.getTypeName() << std::endl;
+            std::cerr<< "Error in Actors::playAnimationGroup:  Unable to find " << ptr.getCellRef().getRefId() << std::endl;
             return false;
         }
     }

apps/openmw/mwmechanics/objects.cpp

@@ -88,7 +88,7 @@ bool Objects::playAnimationGroup(const MWWorld::Ptr& ptr, const std::string& gro
     }
     else
     {
-        std::cerr<< "Error in Objects::playAnimationGroup:  Unable to find " << ptr.getTypeName() << std::endl;
+        std::cerr<< "Error in Objects::playAnimationGroup:  Unable to find " << ptr.getCellRef().getRefId() << std::endl;
         return false;
     }
 }

apps/openmw/mwrender/renderingmanager.cpp

@@ -379,8 +379,17 @@ namespace MWRender
         else
         {
             setFogColor(mFogColor);
-            mStateUpdater->setFogStart(mViewDistance * (1 - mFogDepth));
-            mStateUpdater->setFogEnd(mViewDistance);
+
+            if (mFogDepth == 0.f)
+            {
+                mStateUpdater->setFogStart(0.f);
+                mStateUpdater->setFogEnd(FLT_MAX);
+            }
+            else
+            {
+                mStateUpdater->setFogStart(mViewDistance * (1 - mFogDepth));
+                mStateUpdater->setFogEnd(mViewDistance);
+            }
         }
     }