diff --git a/.rive_head b/.rive_head index 7f9952a1d..ce9df1524 100644 --- a/.rive_head +++ b/.rive_head @@ -1 +1 @@ -fcda031783b4d7e5bf2d983081cfe76ff60b1f57 +bf57f85d7fb6e30a2070ae4f104b8ec49e99c2fe diff --git a/dev/defs/shapes/paint/shape_paint.json b/dev/defs/shapes/paint/shape_paint.json index 5514506b1..c40203b93 100644 --- a/dev/defs/shapes/paint/shape_paint.json +++ b/dev/defs/shapes/paint/shape_paint.json @@ -27,12 +27,12 @@ }, "blendModeValue": { "type": "uint", - "initialValue": "-1", + "initialValue": "127", "key": { "int": 747, "string": "blendmodevalue" }, - "description": "Shape paint blend mode value. -1 means inherit." + "description": "Shape paint blend mode value. 127 means inherit." } } } \ No newline at end of file diff --git a/include/rive/generated/shapes/paint/shape_paint_base.hpp b/include/rive/generated/shapes/paint/shape_paint_base.hpp index 9b12df07e..25796ba06 100644 --- a/include/rive/generated/shapes/paint/shape_paint_base.hpp +++ b/include/rive/generated/shapes/paint/shape_paint_base.hpp @@ -35,7 +35,7 @@ class ShapePaintBase : public ContainerComponent protected: bool m_IsVisible = true; - uint32_t m_BlendModeValue = -1; + uint32_t m_BlendModeValue = 127; public: virtual bool isVisible() const { return m_IsVisible; } diff --git a/src/shapes/paint/shape_paint.cpp b/src/shapes/paint/shape_paint.cpp index 0ad220de1..d4a6c3073 100644 --- a/src/shapes/paint/shape_paint.cpp +++ b/src/shapes/paint/shape_paint.cpp @@ -38,7 +38,8 @@ RenderPaint* ShapePaint::initRenderPaint(ShapePaintMutator* mutator) void ShapePaint::blendMode(BlendMode parentValue) { assert(m_RenderPaint != nullptr); - if (blendModeValue() == -1) + // 127 means inherit + if (blendModeValue() == 127) { m_RenderPaint->blendMode(parentValue); }