mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-09 18:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix experimental "nonactive-layers opacity" mode for the SimpleRenderer

Browse Source 
Regression introduced in 24846eae10c7340a4e7f103b15494ea8338700a9
This commit is contained in:
David Capello 2023-05-05 22:11:19 -03:00
parent 8cdb4edcac
commit 8e91d22b70
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/render/render.cpp
View File

@ -686,7 +686,7 @@ void Render::renderLayer(
renderPlan( renderPlan(
plan, dstImage, area, plan, dstImage, area,
frame, compositeImage, frame, compositeImage,
true, true, blendMode, false); true, true, blendMode);
} }
void Render::renderSprite( void Render::renderSprite(
@ -789,8 +789,7 @@ void Render::renderSpriteLayers(Image* dstImage,
area, frame, compositeImage, area, frame, compositeImage,
true, true,
false, false,
BlendMode::UNSPECIFIED, BlendMode::UNSPECIFIED);
false);
// Draw onion skin behind the sprite. // Draw onion skin behind the sprite.
if (m_onionskin.position() == OnionskinPosition::BEHIND) if (m_onionskin.position() == OnionskinPosition::BEHIND)
@ -802,7 +801,7 @@ void Render::renderSpriteLayers(Image* dstImage,
area, frame, compositeImage, area, frame, compositeImage,
false, false,
true, true,
BlendMode::UNSPECIFIED, false); BlendMode::UNSPECIFIED);
} }
void Render::renderBackground(Image* image, void Render::renderBackground(Image* image,
@ -906,7 +905,7 @@ void Render::renderOnionskin(
// when opacity is < 255 // when opacity is < 255
(m_globalOpacity < 255 && (m_globalOpacity < 255 &&
m_onionskin.position() == OnionskinPosition::INFRONT), m_onionskin.position() == OnionskinPosition::INFRONT),
true, blendMode, false); true, blendMode);
} }
} }
} }
@ -1003,8 +1002,7 @@ void Render::renderPlan(
const CompositeImageFunc compositeImage, const CompositeImageFunc compositeImage,
const bool render_background, const bool render_background,
const bool render_transparent, const bool render_transparent,
const BlendMode blendMode, const BlendMode blendMode)
bool isSelected)
{ {
for (const auto& item : plan.items()) { for (const auto& item : plan.items()) {
const Cel* cel = item.cel; const Cel* cel = item.cel;
@ -1012,9 +1010,7 @@ void Render::renderPlan(
ASSERT(layer->isVisible()); // Hidden layers shouldn't be in the plan ASSERT(layer->isVisible()); // Hidden layers shouldn't be in the plan
if (m_selectedLayerForOpacity == layer) const bool isSelected = (m_selectedLayerForOpacity == layer);
isSelected = true;
gfx::Rect extraArea; gfx::Rect extraArea;
bool drawExtra = false; bool drawExtra = false;

5
src/render/render.h
View File

@ -1,5 +1,5 @@
// Aseprite Render Library // Aseprite Render Library
// Copyright (c) 2019-2022 Igara Studio S.A. // Copyright (c) 2019-2023 Igara Studio S.A.
// Copyright (c) 2001-2018 David Capello // Copyright (c) 2001-2018 David Capello
// //
// This file is released under the terms of the MIT license. // This file is released under the terms of the MIT license.
@ -167,8 +167,7 @@ namespace render {
const CompositeImageFunc compositeImage, const CompositeImageFunc compositeImage,
const bool render_background, const bool render_background,
const bool render_transparent, const bool render_transparent,
const BlendMode blendMode, const BlendMode blendMode);
bool isSelected);
void renderCel( void renderCel(
Image* dst_image, Image* dst_image,