diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2019-08-10 14:24:26 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2019-08-10 14:24:26 +0300 |
| commit | b9898ebde44d6584ea37a05aaeca8760d31ccc7b (patch) | |
| tree | e6dfc796cc82b4b8b8c248c4ff29d2e2047ff84c /source/blender/makesrna/intern/rna_image.c | |
| parent | b17380971a144896b34b7863a82bbda3ff68a39f (diff) | |
| parent | 553b581f25c1782c4231816965cd3f6ce58a449a (diff) | |
Merge branch 'master' into filebrowser_redesign
Diffstat (limited to 'source/blender/makesrna/intern/rna_image.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_image.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index d6f4d82c298..75867b2fe13 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -700,7 +700,7 @@ static void rna_def_image(BlenderRNA *brna) "PREMUL", 0, "Premultiplied", - "Store RGB channels with alpha multipled in, also known as associated alpha. The natural " + "Store RGB channels with alpha multiplied in, also known as associated alpha. The natural " "format for renders and used by file formats like OpenEXR"}, {IMA_ALPHA_CHANNEL_PACKED, "CHANNEL_PACKED", |