Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

fix(tools): skip raster undo when the start-frame image is missing

Ahl76adae4d762dd2
diff --git a/toonz/sources/tnztools/fullcolorbrushtool.cpp b/toonz/sources/tnztools/fullcolorbrushtool.cpp
index 02fc1d161..ab5473250 100644
--- a/toonz/sources/tnztools/fullcolorbrushtool.cpp
+++ b/toonz/sources/tnztools/fullcolorbrushtool.cpp
@@ -253,6 +253,7 @@ void FullColorBrushTool::onActivate() {
setWorkAndBackupImages();
onColorStyleChanged();
updateModifiers();
+ m_skipStrokeUntilDown = false;
}
//--------------------------------------------------------------------------------------------------
@@ -261,8 +262,9 @@ void FullColorBrushTool::onDeactivate() {
if (m_notifier) m_notifier->onDeactivate();
m_inputmanager.finishTracks();
- m_workRaster = TRaster32P();
- m_backUpRas = TRasterP();
+ m_workRaster = TRaster32P();
+ m_backUpRas = TRasterP();
+ m_skipStrokeUntilDown = false;
}
//--------------------------------------------------------------------------------------------------
@@ -372,13 +374,6 @@ bool FullColorBrushTool::preLeftButtonDown() {
void FullColorBrushTool::handleMouseEvent(MouseEventType type,
const TPointD &pos,
const TMouseEvent &e) {
- if (m_skipStrokeUntilDown) {
- if (type == ME_DOWN)
- m_skipStrokeUntilDown = false;
- else if (type != ME_MOVE)
- return;
- }
-
TTimerTicks t = TToolTimer::ticks();
bool alt = e.getModifiersMask() & TMouseEvent::ALT_KEY;
bool shift = e.getModifiersMask() & TMouseEvent::SHIFT_KEY;
@@ -403,6 +398,13 @@ void FullColorBrushTool::handleMouseEvent(MouseEventType type,
if (control != m_inputmanager.state.isKeyPressed(TKey::control))
m_inputmanager.keyEvent(control, TKey::control, t, nullptr);
+ if (m_skipStrokeUntilDown) {
+ if (type == ME_DOWN)
+ m_skipStrokeUntilDown = false;
+ else if (type != ME_MOVE)
+ return;
+ }
+
if (type == ME_MOVE) {
THoverList hovers(1, pos);
m_inputmanager.hoverEvent(hovers);
@@ -672,7 +674,6 @@ void FullColorBrushTool::commitStroke() {
sl = level ? level->getSimpleLevel() : 0;
if (sl) ri = TRasterImageP(sl->getFrame(frameId, true));
}
- if (!ri) ri = (TRasterImageP)getImage(true);
TRasterP ras = ri ? ri->getRaster() : TRasterP();
m_lastRect.empty();
diff --git a/toonz/sources/tnztools/toonzrasterbrushtool.cpp b/toonz/sources/tnztools/toonzrasterbrushtool.cpp
index f40808fcc..87852e8bd 100644
--- a/toonz/sources/tnztools/toonzrasterbrushtool.cpp
+++ b/toonz/sources/tnztools/toonzrasterbrushtool.cpp
@@ -1034,6 +1034,7 @@ void ToonzRasterBrushTool::onActivate() {
updateModifiers();
m_brushTimer.start();
+ m_skipStrokeUntilDown = false;
// TODO:app->editImageOrSpline();
}
@@ -1041,9 +1042,10 @@ void ToonzRasterBrushTool::onActivate() {
void ToonzRasterBrushTool::onDeactivate() {
m_inputmanager.finishTracks();
- m_enabled = false;
- m_workRas = TRaster32P();
- m_backupRas = TRasterCM32P();
+ m_enabled = false;
+ m_workRas = TRaster32P();
+ m_backupRas = TRasterCM32P();
+ m_skipStrokeUntilDown = false;
}
//--------------------------------------------------------------------------------------------------
@@ -1113,13 +1115,6 @@ bool ToonzRasterBrushTool::preLeftButtonDown() {
void ToonzRasterBrushTool::handleMouseEvent(MouseEventType type,
const TPointD &pos,
const TMouseEvent &e) {
- if (m_skipStrokeUntilDown) {
- if (type == ME_DOWN)
- m_skipStrokeUntilDown = false;
- else if (type != ME_MOVE)
- return;
- }
-
TTimerTicks t = TToolTimer::ticks();
bool alt = e.getModifiersMask() & TMouseEvent::ALT_KEY;
bool shift = e.getModifiersMask() & TMouseEvent::SHIFT_KEY;
@@ -1149,6 +1144,13 @@ void ToonzRasterBrushTool::handleMouseEvent(MouseEventType type,
if (control != m_inputmanager.state.isKeyPressed(TKey::control))
m_inputmanager.keyEvent(control, TKey::control, t, nullptr);
+ if (m_skipStrokeUntilDown) {
+ if (type == ME_DOWN)
+ m_skipStrokeUntilDown = false;
+ else if (type != ME_MOVE)
+ return;
+ }
+
if (type == ME_MOVE) {
THoverList hovers(1, fixedPos);
m_inputmanager.hoverEvent(hovers);