瀏覽代碼

since we do in fact allow arbitrary tack on variables to scriptobject derivatives, and thus tamls, reporting theres a non hardcoded variable entry is actively counterproductive to flexibility.
plus minor format fix

AzaezelX 2 年之前
父節點
當前提交
7872f01689
共有 3 個文件被更改,包括 5 次插入5 次删除
  1. 1 1
      Engine/source/console/simObject.cpp
  2. 3 3
      Engine/source/gfx/bitmap/ddsFile.cpp
  3. 1 1
      Engine/source/gfx/bitmap/gBitmap.cpp

+ 1 - 1
Engine/source/console/simObject.cpp

@@ -567,7 +567,7 @@ void SimObject::onTamlCustomRead(TamlCustomNodes const& customNodes)
                   else
                   {
                      // Unknown name so warn.
-                     Con::warnf("SimObject::onTamlCustomRead() - Encountered an unknown custom field name of '%s'.", fieldName);
+                     //Con::warnf("SimObject::onTamlCustomRead() - Encountered an unknown custom field name of '%s'.", fieldName);
                      continue;
                   }
                }

+ 3 - 3
Engine/source/gfx/bitmap/ddsFile.cpp

@@ -123,7 +123,7 @@ U32 DDSFile::getSurfaceSize( U32 height, U32 width, U32 mipLevel ) const
    if(mFlags.test(CompressedData))
    {
       // From the directX docs:
-      // max(1, width ÷ 4) x max(1, height ÷ 4) x 8(DXT1) or 16(DXT2-5)
+      // max(1, width / 4) x max(1, height / 4) x 8(DXT1) or 16(DXT2-5)
 
       U32 sizeMultiple = 0;
 
@@ -178,7 +178,7 @@ U32 DDSFile::getSizeInBytes( GFXFormat format, U32 height, U32 width, U32 mipLev
       "DDSFile::getSizeInBytes - Must be a Block Compression format!" );
 
    // From the directX docs:
-   // max(1, width ÷ 4) x max(1, height ÷ 4) x 8(DXT1) or 16(DXT2-5)
+   // max(1, width / 4) x max(1, height / 4) x 8(DXT1) or 16(DXT2-5)
 
    U32 sizeMultiple = 0;
    if ( format == GFXFormatBC1 || format == GFXFormatBC1_SRGB || format == GFXFormatBC4)
@@ -808,4 +808,4 @@ DefineEngineFunction( getActiveDDSFiles, S32, (),,
    "@ingroup Rendering\n" )
 {
    return DDSFile::smActiveCopies;
-}
+}

+ 1 - 1
Engine/source/gfx/bitmap/gBitmap.cpp

@@ -1321,7 +1321,7 @@ U32 GBitmap::getSurfaceSize(const U32 mipLevel) const
    if (mInternalFormat >= GFXFormatBC1 && mInternalFormat <= GFXFormatBC3)
    {
       // From the directX docs:
-      // max(1, width ÷ 4) x max(1, height ÷ 4) x 8(DXT1) or 16(DXT2-5)
+      // max(1, width / 4) x max(1, height / 4) x 8(DXT1) or 16(DXT2-5)
 
       U32 sizeMultiple = 0;