summaryrefslogtreecommitdiffstats
path: root/src/box3d.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-11-07 18:39:36 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-11-07 18:39:36 +0000
commit00b54d2572059afea7ca05f4104c1d86a44bc22d (patch)
tree942b3b99e09471baadbd1c241c9ae4bc0771d4e9 /src/box3d.cpp
parentupdate to trunk (diff)
parentRebase on upstream libcroco 0.6.9 and backport minor fixes (diff)
downloadinkscape-00b54d2572059afea7ca05f4104c1d86a44bc22d.tar.gz
inkscape-00b54d2572059afea7ca05f4104c1d86a44bc22d.zip
update to trunk
(bzr r14422.1.42)
Diffstat (limited to 'src/box3d.cpp')
-rw-r--r--src/box3d.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/box3d.cpp b/src/box3d.cpp
index dc04a2eb6..c4c2728e4 100644
--- a/src/box3d.cpp
+++ b/src/box3d.cpp
@@ -50,6 +50,11 @@ SPBox3D::SPBox3D() : SPGroup() {
this->persp_href = NULL;
this->persp_ref = new Persp3DReference(this);
+
+ /* we initialize the z-orders to zero so that they are updated during dragging */
+ for (int i = 0; i < 6; ++i) {
+ z_orders[i] = 0;
+ }
}
SPBox3D::~SPBox3D() {
@@ -902,7 +907,7 @@ box3d_swap_sides(int z_orders[6], Box3D::Axis axis) {
}
}
- if (pos1 != -1){
+ if ((pos1 != -1) && (pos2 != -1)){
int tmp = z_orders[pos1];
z_orders[pos1] = z_orders[pos2];
z_orders[pos2] = tmp;