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

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra=5D_krita/plugins/filters/phongbumpmap=3A_A?=
From:       José_Luis_Vergara <pentalis () gmail ! com>
Date:       2011-06-30 20:39:10
Message-ID: 20110630203910.66678A60D4 () git ! kde ! org
[Download RAW message or body]

Git commit 82f55da2c7cfe7ca2cf47cf28897cccda949de88 by José Luis Vergara.
Committed on 30/06/2011 at 22:38.
Pushed by jlvergara into branch 'master'.

Avoid null pointer dereference

M  +2    -2    krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp \


http://commits.kde.org/calligra/82f55da2c7cfe7ca2cf47cf28897cccda949de88

diff --git a/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp \
b/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp index \
                fedb468..fdd74f3 100644
--- a/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp
+++ b/krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_config_widget.cpp
@@ -63,6 +63,8 @@ KisPhongBumpmapConfigWidget::KisPhongBumpmapConfigWidget(const \
KisPaintDeviceSP  
 void KisPhongBumpmapConfigWidget::setConfiguration(const KisPropertiesConfiguration \
*config)  {
+    if (!config) return;
+    
     QVariant tempcolor;
     m_page->ambientReflectivityKisDoubleSliderSpinBox->setValue( \
                config->getDouble(PHONG_AMBIENT_REFLECTIVITY) );
     m_page->diffuseReflectivityKisDoubleSliderSpinBox->setValue( \
config->getDouble(PHONG_DIFFUSE_REFLECTIVITY) ); @@ -91,8 +93,6 @@ void \
                KisPhongBumpmapConfigWidget::setConfiguration(const \
                KisPropertiesConfigurat
     m_page->inclinationSpinBox2->setValue( \
                config->getDouble(PHONG_ILLUMINANT_INCLINATION[1]) );
     m_page->inclinationSpinBox3->setValue( \
                config->getDouble(PHONG_ILLUMINANT_INCLINATION[2]) );
     m_page->inclinationSpinBox4->setValue( \
                config->getDouble(PHONG_ILLUMINANT_INCLINATION[3]) );
-
-    if (!config) return;
 }
 
 KisPropertiesConfiguration *KisPhongBumpmapConfigWidget::configuration() const


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