diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-03 18:44:36 +0300 |
| commit | a43ebc63fafeb3b945529117a2efacc80399d272 (patch) | |
| tree | d8ab3e90e50177874f2423b3bc1486548dccd7dd /source/blender/imbuf/IMB_imbuf_types.h | |
| parent | b46e987a70682fcfc227ec71e9726c3ad6a230db (diff) | |
| parent | 265ec400ab1945cd7bc78d50b7d8f184c01fdd10 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/collision.c
Diffstat (limited to 'source/blender/imbuf/IMB_imbuf_types.h')
| -rw-r--r-- | source/blender/imbuf/IMB_imbuf_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h index e83357ac82e..210fd6e86f5 100644 --- a/source/blender/imbuf/IMB_imbuf_types.h +++ b/source/blender/imbuf/IMB_imbuf_types.h @@ -67,7 +67,7 @@ typedef struct DDSData { */ /* ibuf->ftype flag, main image types */ -/* Warning: Keep explicit value assignements here, this file is included in areas where not all format defines +/* Warning: Keep explicit value assignments here, this file is included in areas where not all format defines * are set (e.g. intern/dds only get WITH_DDS, even if TIFF, HDR etc are also defined). See T46524. */ enum eImbTypes { IMB_FTYPE_PNG = 1, @@ -253,7 +253,7 @@ typedef struct ImBuf { #define IB_tilecache (1 << 11) #define IB_alphamode_premul (1 << 12) /* indicates whether image on disk have premul alpha */ #define IB_alphamode_detect (1 << 13) /* if this flag is set, alpha mode would be guessed from file */ -#define IB_ignore_alpha (1 << 14) /* ignore alpha on load and substitude it with 1.0f */ +#define IB_ignore_alpha (1 << 14) /* ignore alpha on load and substitute it with 1.0f */ #define IB_thumbnail (1 << 15) #define IB_multiview (1 << 16) |