mirror of
https://github.com/aseprite/aseprite.git
synced 2025-02-10 15:40:31 +00:00
Fix initialization order of members
This commit is contained in:
parent
eae57b865e
commit
1b541e1a24
@ -46,13 +46,13 @@ namespace cmd {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
ObjectId m_oldImageId;
|
||||||
|
ObjectId m_newImageId;
|
||||||
|
|
||||||
// Reference used only to keep the copy of the new image from the
|
// Reference used only to keep the copy of the new image from the
|
||||||
// ReplaceImage() ctor until the ReplaceImage::onExecute() call.
|
// ReplaceImage() ctor until the ReplaceImage::onExecute() call.
|
||||||
// Then the reference is not used anymore.
|
// Then the reference is not used anymore.
|
||||||
ImageRef m_newImage;
|
ImageRef m_newImage;
|
||||||
|
|
||||||
ObjectId m_oldImageId;
|
|
||||||
ObjectId m_newImageId;
|
|
||||||
ImageRef m_copy;
|
ImageRef m_copy;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -61,10 +61,10 @@ public:
|
|||||||
, m_doc(editor->document())
|
, m_doc(editor->document())
|
||||||
, m_sprite(editor->sprite())
|
, m_sprite(editor->sprite())
|
||||||
, m_pal(m_sprite->palette(editor->frame()))
|
, m_pal(m_sprite->palette(editor->frame()))
|
||||||
|
, m_zoom(editor->zoom())
|
||||||
, m_index_bg_color(-1)
|
, m_index_bg_color(-1)
|
||||||
, m_doublebuf(Image::create(IMAGE_RGB, ui::display_w(), ui::display_h()))
|
, m_doublebuf(Image::create(IMAGE_RGB, ui::display_w(), ui::display_h()))
|
||||||
, m_doublesur(she::instance()->createRgbaSurface(ui::display_w(), ui::display_h()))
|
, m_doublesur(she::instance()->createRgbaSurface(ui::display_w(), ui::display_h())) {
|
||||||
, m_zoom(editor->zoom()) {
|
|
||||||
// Do not use DocumentWriter (do not lock the document) because we
|
// Do not use DocumentWriter (do not lock the document) because we
|
||||||
// will call other sub-commands (e.g. previous frame, next frame,
|
// will call other sub-commands (e.g. previous frame, next frame,
|
||||||
// etc.).
|
// etc.).
|
||||||
|
Loading…
x
Reference in New Issue
Block a user