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:
authorCampbell Barton <ideasman42@gmail.com>2011-11-22 04:35:26 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-22 04:35:26 +0400
commit743d2f8c0f4359eef120eab4db7bfe00b5185e05 (patch)
tree2ea0e95f16a5a4cdb285ef40202995842ad6f920 /source/blender/editors/space_image/image_buttons.c
parent7d124edeadeb60b41e7c828c6b9c18c0850aa933 (diff)
rename image type defines to be less ambiguous, also set BMP as not supporting alpha (it reads but cant write)
Diffstat (limited to 'source/blender/editors/space_image/image_buttons.c')
-rw-r--r--source/blender/editors/space_image/image_buttons.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c
index 892ab9daf25..c1ddad3c012 100644
--- a/source/blender/editors/space_image/image_buttons.c
+++ b/source/blender/editors/space_image/image_buttons.c
@@ -859,21 +859,21 @@ void uiTemplateImageSettings(uiLayout *layout, PointerRNA *imfptr)
uiItemR(col, imfptr, "use_zbuffer", 0, NULL, ICON_NONE);
}
- if (ELEM(imf->imtype, R_OPENEXR, R_MULTILAYER)) {
+ if (ELEM(imf->imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER)) {
uiItemR(col, imfptr, "exr_codec", 0, NULL, ICON_NONE);
- if (is_render_out && (imf->imtype == R_OPENEXR)) {
+ if (is_render_out && (imf->imtype == R_IMF_IMTYPE_OPENEXR)) {
uiItemR(col, imfptr, "use_preview", 0, NULL, ICON_NONE);
}
}
- if (imf->imtype == R_JP2) {
+ if (imf->imtype == R_IMF_IMTYPE_JP2) {
uiItemR(col, imfptr, "use_jpeg2k_ycc", 0, NULL, ICON_NONE);
uiItemR(col, imfptr, "use_jpeg2k_cinema_preset", 0, NULL, ICON_NONE);
uiItemR(col, imfptr, "use_jpeg2k_cinema_48", 0, NULL, ICON_NONE);
}
- if (imf->imtype == R_CINEON) {
+ if (imf->imtype == R_IMF_IMTYPE_CINEON) {
#if 1
uiItemL(col, "FIXME: hard coded Non-Linear, Gamma:1.0", ICON_NONE);
#else