summaryrefslogtreecommitdiffstats
path: root/src/box3d.cpp
diff options
context:
space:
mode:
authorKris De Gussem <kris.degussem@gmail.com>2015-11-06 23:03:53 +0000
committerKris De Gussem <Kris.De.Gussem@hotmail.com>2015-11-06 23:03:53 +0000
commitce318a442bc1c9fb4381e1b9ad11effb1314f9b7 (patch)
tree11c4883a38c0b3d91bcc19997f57ebcb0784165f /src/box3d.cpp
parentstatic code analysis (diff)
downloadinkscape-ce318a442bc1c9fb4381e1b9ad11effb1314f9b7.tar.gz
inkscape-ce318a442bc1c9fb4381e1b9ad11effb1314f9b7.zip
static code analysis
(bzr r14448)
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;