diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-05-08 00:53:49 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-05-08 00:53:49 +0400 |
| commit | 3fe841597bd9e42dfcdfc9be4eefa661e7512265 (patch) | |
| tree | 278fb691c4f1cfc23f1a0fe2059610dc74ef8fd2 /source/blender/makesrna | |
| parent | 471c28f91c489d40ae80561ce4d9629d2f152292 (diff) | |
Apply part of [#21590] .dds textures: fix for DXT1n format
Submitted by Amorilia.
DXT1 .dds textures with 1-bit alpha channel have their alpha channel imported in Blender.
The patch also makes change to contact info for the patch submitter.
I left the sync with upstream nvtt for another commit.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 3 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 3c26c18f17f..d55534bb1b5 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -1323,6 +1323,9 @@ static void def_cmp_output_file(StructRNA *srna) {R_TARGA, "TARGA", 0, "Targa", ""}, {R_RAWTGA, "RAW_TARGA", 0, "Targa Raw", ""}, {R_PNG, "PNG", 0, "PNG", ""}, +#ifdef WITH_DDS + {R_DDS, "DDS", 0, "DirectDraw Surface", ""}, +#endif {R_BMP, "BMP", 0, "BMP", ""}, {R_JPEG90, "JPEG", 0, "JPEG", ""}, {R_IRIS, "IRIS", 0, "IRIS", ""}, diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index e06e71d6a0e..1497f5a4405 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -101,7 +101,9 @@ EnumPropertyItem snap_element_items[] = { EnumPropertyItem image_type_items[] = { {0, "", 0, "Image", NULL}, {R_BMP, "BMP", ICON_FILE_IMAGE, "BMP", ""}, - //{R_DDS, "DDS", ICON_FILE_IMAGE, "DDS", ""}, // XXX not yet implemented +#ifdef WITH_DDS + {R_DDS, "DDS", ICON_FILE_IMAGE, "DDS", ""}, +#endif {R_IRIS, "IRIS", ICON_FILE_IMAGE, "Iris", ""}, {R_PNG, "PNG", ICON_FILE_IMAGE, "PNG", ""}, {R_JPEG90, "JPEG", ICON_FILE_IMAGE, "JPEG", ""}, |