diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 04:35:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-22 04:35:26 +0400 |
| commit | 743d2f8c0f4359eef120eab4db7bfe00b5185e05 (patch) | |
| tree | 2ea0e95f16a5a4cdb285ef40202995842ad6f920 /source/blender/editors/space_image | |
| parent | 7d124edeadeb60b41e7c828c6b9c18c0850aa933 (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')
| -rw-r--r-- | source/blender/editors/space_image/image_buttons.c | 8 | ||||
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 6 |
2 files changed, 7 insertions, 7 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 diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 6d9fd661125..bff2d82e041 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -918,7 +918,7 @@ static void save_image_options_defaults(SaveImageOptions *simopts) { memset(&simopts->im_format, 0, sizeof(simopts->im_format)); simopts->im_format.planes= R_IMF_PLANES_RGB; - simopts->im_format.imtype= R_PNG; + simopts->im_format.imtype= R_IMF_IMTYPE_PNG; simopts->im_format.quality= 90; simopts->im_format.compress= 90; simopts->filepath[0]= '\0'; @@ -962,7 +962,7 @@ static int save_image_options_init(SaveImageOptions *simopts, SpaceImage *sima, is_depth_set= TRUE; } else if (ima->source == IMA_SRC_GENERATED) { - simopts->im_format.imtype= R_PNG; + simopts->im_format.imtype= R_IMF_IMTYPE_PNG; } else { simopts->im_format.imtype= BKE_ftype_to_imtype(ibuf->ftype); @@ -1062,7 +1062,7 @@ static void save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI } } - if(simopts->im_format.imtype==R_MULTILAYER) { + if(simopts->im_format.imtype==R_IMF_IMTYPE_MULTILAYER) { Scene *scene= CTX_data_scene(C); RenderResult *rr= BKE_image_acquire_renderresult(scene, ima); if(rr) { |