summaryrefslogtreecommitdiffstats
path: root/src/display/drawing-item.cpp
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2014-10-14 03:01:31 +0000
committer~suv <suv-sf@users.sourceforge.net>2014-10-14 03:01:31 +0000
commit1d2cec18d1038150b6511454a2fbb2b3cb6d36f8 (patch)
tree38aeab42635a7ebfa0b87394e42d8bebbcdc7ce6 /src/display/drawing-item.cpp
parentupdate to trunk (r13586) (diff)
parent2geom: Re-fix IS_NAN and IS_FINITE for solaris (diff)
downloadinkscape-1d2cec18d1038150b6511454a2fbb2b3cb6d36f8.tar.gz
inkscape-1d2cec18d1038150b6511454a2fbb2b3cb6d36f8.zip
update to trunk (r13610)
(bzr r13506.1.112)
Diffstat (limited to 'src/display/drawing-item.cpp')
-rw-r--r--src/display/drawing-item.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index 80eb69546..2ea3641dc 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -967,7 +967,7 @@ DrawingItem::_setStyleCommon(SPStyle *&_style, SPStyle *style)
if (_style) sp_style_unref(_style);
_style = style;
- if (style->filter.set && style->getFilter()) {
+ if (style && style->filter.set && style->getFilter()) {
if (!_filter) {
int primitives = sp_filter_primitive_count(SP_FILTER(style->getFilter()));
_filter = new Inkscape::Filters::Filter(primitives);