replace ImBuf.depth with ImBuf.planes to match ImageFormatData.planes & to avoid confusion with ImageFormatData.depth

2 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c
index 9f96d28f1e6..b6dc5070222 100644
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@ -3039,7 +3039,7 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
 
 			/* color -> greyscale */
 			/* editing directly would alter the render view */
-			if(scene->r.im_format.planes == R_PLANESBW) {
+			if(scene->r.im_format.planes == R_IMF_PLANES_BW) {
 				ImBuf *ibuf_bw= IMB_dupImBuf(ibuf);
 				IMB_color_to_bw(ibuf_bw);
 				IMB_freeImBuf(ibuf);
@@ -3061,7 +3061,7 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
 				if(BLI_testextensie(name, ".exr")) 
 					name[strlen(name)-4]= 0;
 				BKE_add_image_extension(name, R_JPEG90);
-				ibuf->depth= 24; 
+				ibuf->planes= 24;
 				BKE_write_ibuf_stamp(scene, camera, ibuf, name, &imf);
 				printf("\nSaved: %s", name);
 			}
diff --git a/source/blender/render/intern/source/rendercore.c b/source/blender/render/intern/source/rendercore.c
index 456702e0827..5559d2ff34c 100644
--- a/source/blender/render/intern/source/rendercore.c
+++ b/source/blender/render/intern/source/rendercore.c
@@ -2458,7 +2458,7 @@ static int get_next_bake_face(BakeShade *bs)
 							imb_freerectImBuf(ibuf);
 						/* clear image */
 						if(R.r.bake_flag & R_BAKE_CLEAR)
-							IMB_rectfill(ibuf, (ibuf->depth == 32) ? vec_alpha : vec_solid);
+							IMB_rectfill(ibuf, (ibuf->planes == R_IMF_PLANES_RGBA) ? vec_alpha : vec_solid);
 					
 						/* might be read by UI to set active image for display */
 						R.bakebuf= ima;
@@ -2566,7 +2566,7 @@ static void *do_bake_thread(void *bs_v)
 void RE_bake_ibuf_filter(ImBuf *ibuf, char *mask, const int filter)
 {
 	/* must check before filtering */
-	const short is_new_alpha= (ibuf->depth != 32) && BKE_alphatest_ibuf(ibuf);
+	const short is_new_alpha= (ibuf->planes != R_IMF_PLANES_RGBA) && BKE_alphatest_ibuf(ibuf);
 
 	/* Margin */
 	if(filter) {
@@ -2575,10 +2575,10 @@ void RE_bake_ibuf_filter(ImBuf *ibuf, char *mask, const int filter)
 
 	/* if the bake results in new alpha then change the image setting */
 	if(is_new_alpha) {
-		ibuf->depth= 32;
+		ibuf->planes= R_IMF_PLANES_RGBA;
 	}
 	else {
-		if(filter && ibuf->depth != 32) {
+		if(filter && ibuf->planes != R_IMF_PLANES_RGBA) {
 			/* clear alpha added by filtering */
 			IMB_rectfill_alpha(ibuf, 1.0f);
 		}