diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-05-08 13:05:52 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-05-08 13:05:52 +0400 |
| commit | ed3fd722108ea4d41167c8339a97ecd818e78cdf (patch) | |
| tree | 858b8ce14f808667e81bd1b1cab8d02d3415abd9 /source/blender/imbuf/intern/dds/Image.cpp | |
| parent | aaa93c58b367e65bf4124e4b0d380925b0a6f539 (diff) | |
Apply second half of [#21590] .dds textures: fix for DXT1n format + sync with upstream nvtt
submitted by Amorilia
This updates the DDS module with upstearm nvtt (r1042).
Diffstat (limited to 'source/blender/imbuf/intern/dds/Image.cpp')
| -rw-r--r-- | source/blender/imbuf/intern/dds/Image.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/dds/Image.cpp b/source/blender/imbuf/intern/dds/Image.cpp index 9c34c4e7199..b9ec1c0c3aa 100644 --- a/source/blender/imbuf/intern/dds/Image.cpp +++ b/source/blender/imbuf/intern/dds/Image.cpp @@ -41,7 +41,7 @@ #include <stdio.h> // printf -Image::Image() : m_width(0), m_height(0), m_format(Format_RGB), m_data(0) +Image::Image() : m_width(0), m_height(0), m_format(Format_RGB), m_data(NULL) { } @@ -61,7 +61,7 @@ void Image::allocate(uint w, uint h) void Image::free() { if (m_data) delete [] m_data; - m_data = 0; + m_data = NULL; } @@ -132,3 +132,4 @@ void Image::setFormat(Image::Format f) m_format = f; } + |