[Bf-blender-cvs] [39ea728ebfc] cycles_procedural_api: fix infinite recursion
Kévin Dietrich
noreply at git.blender.org
Mon Nov 16 13:10:47 CET 2020
Commit: 39ea728ebfcf464b77c4522d5b4c0bf1babd041e
Author: Kévin Dietrich
Date: Tue Nov 10 15:51:40 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rB39ea728ebfcf464b77c4522d5b4c0bf1babd041e
fix infinite recursion
===================================================================
M intern/cycles/render/scene.h
===================================================================
diff --git a/intern/cycles/render/scene.h b/intern/cycles/render/scene.h
index b2d329c74fb..cff0d1f0ac4 100644
--- a/intern/cycles/render/scene.h
+++ b/intern/cycles/render/scene.h
@@ -110,7 +110,7 @@ inline UpdateFlags operator | (UpdateFlags flag1, UpdateFlags flag2)
inline UpdateFlags &operator |= (UpdateFlags &flag, uint32_t v)
{
- flag |= static_cast<uint32_t>(flag) | v;
+ flag = static_cast<UpdateFlags>(static_cast<uint32_t>(flag) | v);
return flag;
}
More information about the Bf-blender-cvs
mailing list