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

List:       kde-commits
Subject:    koffice/krita/ui
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2010-10-26 9:00:57
Message-ID: 20101026090057.4E9A0AC897 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1189874 by dkazakov:

Fix creation of masks on Shape Layers

Not all the layers have a paintDevice() so all the not-painting tools
must use original() device instead.
BUG:255065


 M  +1 -1      dialogs/kis_dlg_filter.cpp  
 M  +3 -3      kis_mask_manager.cc  


--- trunk/koffice/krita/ui/dialogs/kis_dlg_filter.cpp #1189873:1189874
@@ -73,7 +73,7 @@
         d->uiFilterDialog.pushButtonCreateMaskEffect->hide();
     }
     d->uiFilterDialog.pushButtonCreateMaskEffect->hide(); // TODO fixme, understand \
                why the mask isn't created, and then remove that line
-    d->uiFilterDialog.filterSelection->setPaintDevice(d->node->paintDevice());
+    d->uiFilterDialog.filterSelection->setPaintDevice(d->node->original());
     d->uiFilterDialog.filterSelection->setImage(d->image);
 
     connect(d->uiFilterDialog.pushButtonOk, SIGNAL(pressed()), SLOT(apply()));
--- trunk/koffice/krita/ui/kis_mask_manager.cc #1189873:1189874
@@ -179,14 +179,14 @@
     m_commandsAdapter->addNode(mask, parent, above);
 
     /**
-     * FIXME: We'll use layer's paint device for creation of a thumbnail.
+     * FIXME: We'll use layer's original for creation of a thumbnail.
      * Actually, we can't use it's projection as newly created mask
      * may be going to be inserted in the middle of the masks stack
      */
-    KisPaintDeviceSP paintDevice = layer->paintDevice();
+    KisPaintDeviceSP originalDevice = layer->original();
 
 
-    KisDlgAdjustmentLayer dialog(mask, mask, paintDevice, m_view->image(),
+    KisDlgAdjustmentLayer dialog(mask, mask, originalDevice, m_view->image(),
                                  mask->name(), i18n("New Filter Mask"),
                                  m_view, "dlgfiltermask");
 


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