mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-29 21:33:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #130 - converting to grayscale wasn't adding an undoer to revert the new grayscale palette.

Browse Source
This commit is contained in:
David Capello 2012-07-07 14:20:43 -03:00
parent 9b9daca59f
commit 73af9f1c3a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/undo_transaction.cpp
View File

@ -37,6 +37,7 @@
#include "undoers/add_cel.h" #include "undoers/add_cel.h"
#include "undoers/add_image.h" #include "undoers/add_image.h"
#include "undoers/add_layer.h" #include "undoers/add_layer.h"
#include "undoers/add_palette.h"
#include "undoers/close_group.h" #include "undoers/close_group.h"
#include "undoers/dirty_area.h" #include "undoers/dirty_area.h"
#include "undoers/flip_image.h" #include "undoers/flip_image.h"
@ -270,18 +271,24 @@ void UndoTransaction::setPixelFormat(PixelFormat newFormat, DitheringMethod dith
// Regenerate extras // Regenerate extras
m_document->destroyExtraCel(); m_document->destroyExtraCel();
// change "sprite.palette" // When we are converting to grayscale color mode, we've to destroy
// all palettes and put only one grayscaled-palette at the first
// frame.
if (newFormat == IMAGE_GRAYSCALE) { if (newFormat == IMAGE_GRAYSCALE) {
// Add undoers to revert all palette changes.
if (isEnabled()) { if (isEnabled()) {
// Save all palettes
PalettesList palettes = m_sprite->getPalettes(); PalettesList palettes = m_sprite->getPalettes();
for (PalettesList::iterator it = palettes.begin(); it != palettes.end(); ++it) { for (PalettesList::iterator it = palettes.begin(); it != palettes.end(); ++it) {
Palette* palette = *it; Palette* palette = *it;
m_undoHistory->pushUndoer(new undoers::RemovePalette( m_undoHistory->pushUndoer(new undoers::RemovePalette(
m_undoHistory->getObjects(), m_sprite, palette->getFrame())); m_undoHistory->getObjects(), m_sprite, palette->getFrame()));
} }
m_undoHistory->pushUndoer(new undoers::AddPalette(
m_undoHistory->getObjects(), m_sprite, 0));
} }
// It's a UniquePtr because setPalette'll create a copy of "graypal".
UniquePtr<Palette> graypal(Palette::createGrayscale()); UniquePtr<Palette> graypal(Palette::createGrayscale());
m_sprite->resetPalettes(); m_sprite->resetPalettes();