Merge branch 'master' into blender2.8

1 files changed, 3 insertions, 3 deletions

diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c
index 9fb7e718b18..d506028e306 100644
--- a/source/blender/render/intern/source/multires_bake.c
+++ b/source/blender/render/intern/source/multires_bake.c
@@ -784,7 +784,7 @@ static void apply_heights_callback(DerivedMesh *lores_dm, DerivedMesh *hires_dm,
 	}
 	else {
 		char *rrgb = (char *)ibuf->rect + pixel * 4;
-		rrgb[0] = rrgb[1] = rrgb[2] = FTOCHAR(len);
+		rrgb[0] = rrgb[1] = rrgb[2] = unit_float_to_uchar_clamp(len);
 		rrgb[3] = 255;
 	}
 }
@@ -1158,7 +1158,7 @@ static void apply_ao_callback(DerivedMesh *lores_dm, DerivedMesh *hires_dm, void
 	}
 	else {
 		unsigned char *rrgb = (unsigned char *) ibuf->rect + pixel * 4;
-		rrgb[0] = rrgb[1] = rrgb[2] = FTOCHAR(value);
+		rrgb[0] = rrgb[1] = rrgb[2] = unit_float_to_uchar_clamp(value);
 		rrgb[3] = 255;
 	}
 }
@@ -1215,7 +1215,7 @@ static void bake_ibuf_normalize_displacement(ImBuf *ibuf, float *displacement, c
 
 			if (ibuf->rect) {
 				unsigned char *cp = (unsigned char *) (ibuf->rect + i);
-				cp[0] = cp[1] = cp[2] = FTOCHAR(normalized_displacement);
+				cp[0] = cp[1] = cp[2] = unit_float_to_uchar_clamp(normalized_displacement);
 				cp[3] = 255;
 			}
 		}