diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2021-01-22 21:30:23 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2021-01-22 21:30:23 +0300 |
| commit | aaa1d580548d27d946a8f97fc7c6e99f8fd40f1c (patch) | |
| tree | 7ab66637f51d939affba32665fe5de49a7199878 /source/blender/editors/object | |
| parent | 90bcd5e724f3ca6d6f38e3a0551c300751382e62 (diff) | |
| parent | a1f44e43a253eabee74f40315b62cc0c0ff4cb9c (diff) | |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_bake_api.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c index 113a0395e8c..db9e51a490d 100644 --- a/source/blender/editors/object/object_bake_api.c +++ b/source/blender/editors/object/object_bake_api.c @@ -1062,10 +1062,10 @@ static bool bake_targets_output_vertex_colors(BakeTargets *targets, Object *ob) bake_result_to_rgba(rgba, &result[mloop->v * num_channels], num_channels); if (is_noncolor) { - linearrgb_to_srgb_uchar4(&mloopcol->r, rgba); + unit_float_to_uchar_clamp_v4(&mloopcol->r, rgba); } else { - unit_float_to_uchar_clamp_v4(&mloopcol->r, rgba); + linearrgb_to_srgb_uchar4(&mloopcol->r, rgba); } } } |