Revert the inverted coordinate system fix. 3D Boxes and guides

[inkscape.git] / src / widgets / swatch-selector.cpp

diff --git a/src/widgets/swatch-selector.cpp b/src/widgets/swatch-selector.cpp
index a7bd5eae1126d816b081c0b67a5a0afc5d437527..a6f5133b799861adf64060caa61d5c9226c48358 100644 (file)
--- a/src/widgets/swatch-selector.cpp
+++ b/src/widgets/swatch-selector.cpp
@@ -57,6 +57,11 @@ SwatchSelector::~SwatchSelector()
     _gsel = 0;
 }
 
+SPGradientSelector *SwatchSelector::getGradientSelector()
+{
+    return _gsel;
+}
+
 void SwatchSelector::_grabbedCb(SPColorSelector * /*csel*/, void * /*data*/)
 {
 }
@@ -103,7 +108,7 @@ void SwatchSelector::_changedCb(SPColorSelector */*csel*/, void *data)
 
         // TODO might have to block cycles
 
-        if (swsel->_gsel) {
+        if (swsel->_gsel && swsel->_gsel->getVector()) {
             SPGradient *gradient = swsel->_gsel->getVector();
             SPGradient *ngr = sp_gradient_ensure_vector_normalized(gradient);
             if (ngr != gradient) {
@@ -120,7 +125,7 @@ void SwatchSelector::_changedCb(SPColorSelector */*csel*/, void *data)
                 float alpha = 0;
                 guint32 rgb = 0;
 
-                swsel->_csel->base->getColorAlpha( color, &alpha );
+                swsel->_csel->base->getColorAlpha( color, alpha );
                 rgb = color.toRGBA32( 0x00 );
 
                 // TODO replace with generic shared code that also handles icc-color