Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correct braces with ifdef's

Browse Source
This commit is contained in:
Campbell Barton
2019-04-23 08:36:57 +10:00
parent 0e4e1d257c
commit 36c2162660
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/image.c
View File

@@ -1497,13 +1497,12 @@ void BKE_imbuf_to_image_format(struct ImageFormatData *im_format, const ImBuf *i
if (ftype == IMB_FTYPE_IMAGIC) { if (ftype == IMB_FTYPE_IMAGIC) {
im_format->imtype = R_IMF_IMTYPE_IRIS; im_format->imtype = R_IMF_IMTYPE_IRIS;
#ifdef WITH_HDR
} }
#ifdef WITH_HDR
else if (ftype == IMB_FTYPE_RADHDR) { else if (ftype == IMB_FTYPE_RADHDR) {
im_format->imtype = R_IMF_IMTYPE_RADHDR; im_format->imtype = R_IMF_IMTYPE_RADHDR;
#endif
} }
#endif
else if (ftype == IMB_FTYPE_PNG) { else if (ftype == IMB_FTYPE_PNG) {
im_format->imtype = R_IMF_IMTYPE_PNG; im_format->imtype = R_IMF_IMTYPE_PNG;
@@ -1517,13 +1516,12 @@ void BKE_imbuf_to_image_format(struct ImageFormatData *im_format, const ImBuf *i
#ifdef WITH_DDS #ifdef WITH_DDS
else if (ftype == IMB_FTYPE_DDS) { else if (ftype == IMB_FTYPE_DDS) {
im_format->imtype = R_IMF_IMTYPE_DDS; im_format->imtype = R_IMF_IMTYPE_DDS;
#endif
} }
#endif
else if (ftype == IMB_FTYPE_BMP) { else if (ftype == IMB_FTYPE_BMP) {
im_format->imtype = R_IMF_IMTYPE_BMP; im_format->imtype = R_IMF_IMTYPE_BMP;
#ifdef WITH_TIFF
} }
#ifdef WITH_TIFF
else if (ftype == IMB_FTYPE_TIF) { else if (ftype == IMB_FTYPE_TIF) {
im_format->imtype = R_IMF_IMTYPE_TIFF; im_format->imtype = R_IMF_IMTYPE_TIFF;
if (custom_flags & TIF_16BIT) { if (custom_flags & TIF_16BIT) {
@@ -1565,8 +1563,8 @@ void BKE_imbuf_to_image_format(struct ImageFormatData *im_format, const ImBuf *i
} }
else if (ftype == IMB_FTYPE_DPX) { else if (ftype == IMB_FTYPE_DPX) {
im_format->imtype = R_IMF_IMTYPE_DPX; im_format->imtype = R_IMF_IMTYPE_DPX;
#endif
} }
#endif
else if (ftype == IMB_FTYPE_TGA) { else if (ftype == IMB_FTYPE_TGA) {
if (custom_flags & RAWTGA) { if (custom_flags & RAWTGA) {
im_format->imtype = R_IMF_IMTYPE_RAWTGA; im_format->imtype = R_IMF_IMTYPE_RAWTGA;