diff options
| author | Campbell Barton <campbell@blender.org> | 2022-08-17 08:45:25 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-08-17 08:45:25 +0300 |
| commit | e52fd904e879b64ea924b17cecc1fb345955145f (patch) | |
| tree | 735393e2d0dfb433aa1a955784a9e45e5cef3d91 /source/blender/blenkernel | |
| parent | 288cd705ebe261521e198e80c700f4a52a722372 (diff) | |
| parent | 95fd1630740dfee9399e5462a26ba70e51d89787 (diff) | |
Merge branch 'blender-v3.3-release'
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/image_save.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 8bad89a9211..2ced685884b 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -687,7 +687,7 @@ typedef struct CustomDataTransferLayerMap { size_t data_size; /** Offset of actual data we transfer (in element contained in data_src/dst). */ size_t data_offset; - /** For bitflag transfer, flag(s) to affect in transferred data. */ + /** For bit-flag transfer, flag(s) to affect in transferred data. */ uint64_t data_flag; /** Opaque pointer, to be used by specific interp callback (e.g. transformspace for normals). */ diff --git a/source/blender/blenkernel/intern/image_save.cc b/source/blender/blenkernel/intern/image_save.cc index d366e9362e8..5ee1258c512 100644 --- a/source/blender/blenkernel/intern/image_save.cc +++ b/source/blender/blenkernel/intern/image_save.cc @@ -821,7 +821,7 @@ bool BKE_image_render_write_exr(ReportList *reports, const bool pass_RGBA = (STR_ELEM(rp->chan_id, "RGB", "RGBA", "R", "G", "B", "A")); const bool pass_half_float = half_float && pass_RGBA; - /* Colorspace conversion only happens on RGBA passes. */ + /* Color-space conversion only happens on RGBA passes. */ float *output_rect = (save_as_render && pass_RGBA) ? image_exr_from_scene_linear_to_output( |