Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-05-19 05:40:37 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-05-19 05:40:37 +0400
commitdfcd01553536d63dab1037d0ea289b9d9d90c39c (patch)
tree089cf7b605457c8d565f1e1a3c82558210c5e87d /source/blender/imbuf/intern/dds
parent31471f644cb9d9c3b88da1977705724649482a82 (diff)
parentc04f9b779c4384f3cc6961b2ed54456bdab14f43 (diff)
Merged changes in the trunk up to revision 36757.
Diffstat (limited to 'source/blender/imbuf/intern/dds')
-rw-r--r--source/blender/imbuf/intern/dds/DirectDrawSurface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
index ceac1d2ae18..971658ff482 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
@@ -980,7 +980,7 @@ bool DirectDrawSurface::hasAlpha() const
{
if (header.hasDX10Header())
{
-#pragma NV_MESSAGE("TODO: Update hasAlpha to handle all DX10 formats.")
+ /* TODO: Update hasAlpha to handle all DX10 formats. */
return
header.header10.dxgiFormat == DXGI_FORMAT_BC1_UNORM ||
header.header10.dxgiFormat == DXGI_FORMAT_BC2_UNORM ||