Browse Source

Merge remote-tracking branch 'remotes/nemerle/valgrind_fixes'

Lasse Öörni 11 years ago
parent
commit
aee35424b8
2 changed files with 2 additions and 1 deletions
  1. 1 1
      Source/Engine/Core/Profiler.h
  2. 1 0
      Source/Engine/Graphics/OpenGL/OGLTexture.cpp

+ 1 - 1
Source/Engine/Core/Profiler.h

@@ -67,7 +67,7 @@ public:
             *i = 0;
             *i = 0;
         }
         }
         
         
-        delete name_;
+        delete [] name_;
     }
     }
     
     
     /// Begin timing.
     /// Begin timing.

+ 1 - 0
Source/Engine/Graphics/OpenGL/OGLTexture.cpp

@@ -72,6 +72,7 @@ Texture::Texture(Context* context) :
     Resource(context),
     Resource(context),
     GPUObject(GetSubsystem<Graphics>()),
     GPUObject(GetSubsystem<Graphics>()),
     usage_(TEXTURE_STATIC),
     usage_(TEXTURE_STATIC),
+    format_(0),
     levels_(0),
     levels_(0),
     requestedLevels_(0),
     requestedLevels_(0),
     width_(0),
     width_(0),