[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/krita-texturizer_option-rempt] krita/plugins/paintops/libpaintop: Revert "Don't save the t
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2012-03-27 13:37:12
Message-ID: 20120327133712.544B1A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 4a59310355c3179bba908bc64595019b2052ac24 by Boudewijn Rempt.
Committed on 27/03/2012 at 15:37.
Pushed by rempt into branch 'krita-texturizer_option-rempt'.

Revert "Don't save the texture options if they aren't used"

This reverts commit e5b1d7f4014f451892ad98f82f17286873232c61.

M  +1    -3    krita/plugins/paintops/libpaintop/kis_texture_option.cpp

http://commits.kde.org/calligra/4a59310355c3179bba908bc64595019b2052ac24

diff --git a/krita/plugins/paintops/libpaintop/kis_texture_option.cpp \
b/krita/plugins/paintops/libpaintop/kis_texture_option.cpp index 251a670..d247180 \
                100644
--- a/krita/plugins/paintops/libpaintop/kis_texture_option.cpp
+++ b/krita/plugins/paintops/libpaintop/kis_texture_option.cpp
@@ -129,9 +129,7 @@ KisTextureOption::~KisTextureOption()
 
 void KisTextureOption::writeOptionSetting(KisPropertiesConfiguration* setting) const
 {
-    if (!isChecked()) return;
     if (!m_optionWidget->chooser->currentResource()) return;
-
     KisPattern *pattern = \
static_cast<KisPattern*>(m_optionWidget->chooser->currentResource());  if (!pattern) \
return;  
@@ -157,6 +155,7 @@ void \
KisTextureOption::writeOptionSetting(KisPropertiesConfiguration* setting) c  \
                setting->setProperty("Texture/Pattern/Pattern", ba.toBase64());
     setting->setProperty("Texture/Pattern/PatternFileName", pattern->filename());
     setting->setProperty("Texture/Pattern/Name", pattern->name());
+
     setting->setProperty("Texture/Pattern/Enabled", isChecked());
 }
 
@@ -165,7 +164,6 @@ void KisTextureOption::readOptionSetting(const \
                KisPropertiesConfiguration* setti
     QByteArray ba = \
QByteArray::fromBase64(setting->getString("Texture/Pattern/Pattern").toAscii());  \
QImage img;  img.loadFromData(ba, "PNG");
-
     QString name = setting->getString("Texture/Pattern/Name");
     if (name.isEmpty()) {
         name = setting->getString("Texture/Pattern/FileName");


[prev in list] [next in list] [prev in thread] [next in thread]