[Bf-blender-cvs] [bd467100dd3] blender-v3.3-release: Fix T100142: Compare correct render_slot variable during clear operation

Jesse Yurkovich noreply at git.blender.org
Fri Aug 5 04:46:31 CEST 2022


Commit: bd467100dd3bd038b0628993f196b44d880ccc98
Author: Jesse Yurkovich
Date:   Thu Aug 4 19:41:03 2022 -0700
Branches: blender-v3.3-release
https://developer.blender.org/rBbd467100dd3bd038b0628993f196b44d880ccc98

Fix T100142: Compare correct render_slot variable during clear operation

In {rB0ef8a6179d2a773b2570352bd0cb7eb18b666da2} the parameter name was
changed to match the header declaration (slot) but it missed updating
the variable name inside the function correctly in one instance.

This prevents slot 0 from being cleared if the last slot to be rendered
was not also 0.

Differential Revision: https://developer.blender.org/D15620

===================================================================

M	source/blender/blenkernel/intern/image.cc

===================================================================

diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc
index 975373fcf3b..fa3cc06b087 100644
--- a/source/blender/blenkernel/intern/image.cc
+++ b/source/blender/blenkernel/intern/image.cc
@@ -5516,7 +5516,7 @@ bool BKE_image_clear_renderslot(Image *ima, ImageUser *iuser, int slot)
   }
 
   RenderSlot *render_slot = static_cast<RenderSlot *>(BLI_findlink(&ima->renderslots, slot));
-  if (!slot) {
+  if (!render_slot) {
     return false;
   }
   if (render_slot->render) {



More information about the Bf-blender-cvs mailing list