diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-08 15:07:34 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-04-08 15:07:34 +0300 |
| commit | a981206fd183355bdcc8331b3a74ce3d382e1f67 (patch) | |
| tree | efa5534ed691645530707a80cf4a2039909f79b7 /source/blender/imbuf | |
| parent | 0b5ebb3265b155658d441135e152f32ba11c001d (diff) | |
| parent | 245e01c30ac296c509e04f702c6b5d76086265b5 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/IMB_metadata.h | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/writeimage.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/imbuf/IMB_metadata.h b/source/blender/imbuf/IMB_metadata.h index 0a0d2c1faf6..6a29fa01594 100644 --- a/source/blender/imbuf/IMB_metadata.h +++ b/source/blender/imbuf/IMB_metadata.h @@ -25,7 +25,7 @@ * ***** END GPL LICENSE BLOCK ***** */ -/** \file blender/imbuf/intern/IMB_metadata.h +/** \file blender/imbuf/IMB_metadata.h * \ingroup imbuf */ diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c index c019b0b1363..e340d082895 100644 --- a/source/blender/imbuf/intern/writeimage.c +++ b/source/blender/imbuf/intern/writeimage.c @@ -81,7 +81,7 @@ short IMB_saveiff(struct ImBuf *ibuf, const char *name, int flags) bool IMB_prepare_write_ImBuf(const bool isfloat, ImBuf *ibuf) { - bool changed = false; + bool changed = false; if (isfloat) { /* pass */ @@ -90,9 +90,9 @@ bool IMB_prepare_write_ImBuf(const bool isfloat, ImBuf *ibuf) if (ibuf->rect == NULL && ibuf->rect_float) { ibuf->rect_colorspace = colormanage_colorspace_get_roled(COLOR_ROLE_DEFAULT_BYTE); IMB_rect_from_float(ibuf); - if (ibuf->rect != NULL) { - changed = true; - } + if (ibuf->rect != NULL) { + changed = true; + } } } |