summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThomas Holder <thomas@thomas-holder.de>2018-09-23 19:08:55 +0000
committerThomas Holder <thomas@thomas-holder.de>2018-09-23 19:08:55 +0000
commitd1c232470fb49f9f88a5c8e831ff02380ec24d8e (patch)
treed4094ed00b5aea9d4e35bb8ccba24789fd3c7613 /src
parentfix .odg and .fx export with inverted y-axis (diff)
downloadinkscape-d1c232470fb49f9f88a5c8e831ff02380ec24d8e.tar.gz
inkscape-d1c232470fb49f9f88a5c8e831ff02380ec24d8e.zip
!SP_ACTIVE_DESKTOP -> is_yaxisdown true
Fixes 3D box --export-png
Diffstat (limited to 'src')
-rw-r--r--src/object/box3d.cpp2
-rw-r--r--src/object/persp3d.cpp4
-rw-r--r--src/object/sp-guide.cpp10
3 files changed, 8 insertions, 8 deletions
diff --git a/src/object/box3d.cpp b/src/object/box3d.cpp
index febfef115..7d4074b64 100644
--- a/src/object/box3d.cpp
+++ b/src/object/box3d.cpp
@@ -652,7 +652,7 @@ box3d_XY_axes_are_swapped (SPBox3D *box) {
static inline void
box3d_aux_set_z_orders (int z_orders[6], int a, int b, int c, int d, int e, int f) {
- if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->is_yaxisdown()) {
+ if (!SP_ACTIVE_DESKTOP || SP_ACTIVE_DESKTOP->is_yaxisdown()) {
std::swap(a, f);
std::swap(b, e);
std::swap(c, d);
diff --git a/src/object/persp3d.cpp b/src/object/persp3d.cpp
index 5c6835e28..821f69521 100644
--- a/src/object/persp3d.cpp
+++ b/src/object/persp3d.cpp
@@ -96,7 +96,7 @@ static Proj::Pt2 legacy_transform_forward(Proj::Pt2 pt, SPDocument const *doc) {
}
// <inkscape:perspective> stores inverted y-axis coordinates
- if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->is_yaxisdown()) {
+ if (!SP_ACTIVE_DESKTOP || SP_ACTIVE_DESKTOP->is_yaxisdown()) {
pt[1] *= -1;
if (pt[2]) {
pt[1] += doc->getHeight().value("px");
@@ -111,7 +111,7 @@ static Proj::Pt2 legacy_transform_forward(Proj::Pt2 pt, SPDocument const *doc) {
*/
static Proj::Pt2 legacy_transform_backward(Proj::Pt2 pt, SPDocument const *doc) {
// <inkscape:perspective> stores inverted y-axis coordinates
- if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->is_yaxisdown()) {
+ if (!SP_ACTIVE_DESKTOP || SP_ACTIVE_DESKTOP->is_yaxisdown()) {
pt[1] *= -1;
if (pt[2]) {
pt[1] += doc->getHeight().value("px");
diff --git a/src/object/sp-guide.cpp b/src/object/sp-guide.cpp
index acb0707d0..a89af4533 100644
--- a/src/object/sp-guide.cpp
+++ b/src/object/sp-guide.cpp
@@ -133,7 +133,7 @@ void SPGuide::set(unsigned int key, const gchar *value) {
Geom::Point direction(newx, newy);
// <sodipodi:guide> stores inverted y-axis coordinates
- if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->is_yaxisdown()) {
+ if (!SP_ACTIVE_DESKTOP || SP_ACTIVE_DESKTOP->is_yaxisdown()) {
direction[Geom::Y] *= -1.0;
}
@@ -184,7 +184,7 @@ void SPGuide::set(unsigned int key, const gchar *value) {
}
// <sodipodi:guide> stores inverted y-axis coordinates
- if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->is_yaxisdown()) {
+ if (!SP_ACTIVE_DESKTOP || SP_ACTIVE_DESKTOP->is_yaxisdown()) {
this->point_on_line[Geom::Y] = document->getHeight().value("px") - this->point_on_line[Geom::Y];
}
} else {
@@ -229,7 +229,7 @@ SPGuide *SPGuide::createSPGuide(SPDocument *doc, Geom::Point const &pt1, Geom::P
}
// <sodipodi:guide> stores inverted y-axis coordinates
- if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->is_yaxisdown()) {
+ if (!SP_ACTIVE_DESKTOP || SP_ACTIVE_DESKTOP->is_yaxisdown()) {
newy = doc->getHeight().value("px") - newy;
n[Geom::Y] *= -1.0;
}
@@ -386,7 +386,7 @@ void SPGuide::moveto(Geom::Point const point_on_line, bool const commit)
double newy = point_on_line.y();
// <sodipodi:guide> stores inverted y-axis coordinates
- if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->is_yaxisdown()) {
+ if (!SP_ACTIVE_DESKTOP || SP_ACTIVE_DESKTOP->is_yaxisdown()) {
newy = document->getHeight().value("px") - newy;
}
@@ -439,7 +439,7 @@ void SPGuide::set_normal(Geom::Point const normal_to_line, bool const commit)
auto normal = normal_to_line;
// <sodipodi:guide> stores inverted y-axis coordinates
- if (SP_ACTIVE_DESKTOP && SP_ACTIVE_DESKTOP->is_yaxisdown()) {
+ if (!SP_ACTIVE_DESKTOP || SP_ACTIVE_DESKTOP->is_yaxisdown()) {
normal[Geom::Y] *= -1.0;
}