summaryrefslogtreecommitdiffstats
path: root/src/sp-pattern.cpp
diff options
context:
space:
mode:
authorJon A. Cruz <jon@joncruz.org>2013-04-29 00:51:29 +0000
committerJon A. Cruz <jon@joncruz.org>2013-04-29 00:51:29 +0000
commitc317c1f79519f0ee961842ffb9feac4494af5377 (patch)
tree28187bf8ccee447689430f1c0243700e0565e958 /src/sp-pattern.cpp
parentTemporily fix abiguous macros before later removal. (diff)
downloadinkscape-c317c1f79519f0ee961842ffb9feac4494af5377.tar.gz
inkscape-c317c1f79519f0ee961842ffb9feac4494af5377.zip
Fixed logic error confusing bitwise and with logical and.
Whitespace cleanup to make the issue easier to spot. (bzr r12311)
Diffstat (limited to 'src/sp-pattern.cpp')
-rw-r--r--src/sp-pattern.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sp-pattern.cpp b/src/sp-pattern.cpp
index 23cd3d32e..c4308a1a9 100644
--- a/src/sp-pattern.cpp
+++ b/src/sp-pattern.cpp
@@ -591,7 +591,7 @@ sp_pattern_create_pattern(SPPaintServer *ps,
SPPattern *shown = NULL;
for (SPPattern *pat_i = pat; pat_i != NULL; pat_i = pat_i->ref ? pat_i->ref->getObject() : NULL) {
// find the first one with item children
- if (pat_i && SP_IS_OBJECT (pat_i) && pattern_hasItemChildren(pat_i)) {
+ if (pat_i && SP_IS_OBJECT(pat_i) && pattern_hasItemChildren(pat_i)) {
shown = pat_i;
break; // do not go further up the chain if children are found
}