summaryrefslogtreecommitdiffstats
path: root/src/box3d-side.cpp
diff options
context:
space:
mode:
authorLiam P. White <inkscapebrony@gmail.com>2014-10-25 18:36:10 +0000
committerLiam P. White <inkscapebrony@gmail.com>2014-10-25 18:36:10 +0000
commit17f09296aa0beff56222e2d9c24f92a8ce94eef2 (patch)
tree9eae706e5f1145ee3184e41432f6d4315a53dce5 /src/box3d-side.cpp
parentUpdate perspective-envelope to be affected by the clip or mask on LPE patch (diff)
parentCleaned casts from sp-shape by fixing member type. (diff)
downloadinkscape-17f09296aa0beff56222e2d9c24f92a8ce94eef2.tar.gz
inkscape-17f09296aa0beff56222e2d9c24f92a8ce94eef2.zip
Update to trunk r13638
(bzr r13341.1.286)
Diffstat (limited to 'src/box3d-side.cpp')
-rw-r--r--src/box3d-side.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp
index dfccb63bf..3058eab2d 100644
--- a/src/box3d-side.cpp
+++ b/src/box3d-side.cpp
@@ -4,6 +4,7 @@
* Authors:
* Maximilian Albert <Anhalter42@gmx.de>
* Abhishek Sharma
+ * Jon A. Cruz <jon@joncruz.org>
*
* Copyright (C) 2007 Authors
*
@@ -166,13 +167,12 @@ void Box3DSide::set_shape() {
SPObject *parent = this->parent;
- if (!SP_IS_BOX3D(parent)) {
+ SPBox3D *box = dynamic_cast<SPBox3D *>(parent);
+ if (!box) {
g_warning("Parent of 3D box side is not a 3D box.\n");
return;
}
- SPBox3D *box = SP_BOX3D(parent);
-
Persp3D *persp = box3d_side_perspective(this);
if (!persp) {
@@ -259,7 +259,8 @@ box3d_side_compute_corner_ids(Box3DSide *side, unsigned int corners[4]) {
Persp3D *
box3d_side_perspective(Box3DSide *side) {
- return SP_BOX3D(side->parent)->persp_ref->getObject();
+ SPBox3D *box = side ? dynamic_cast<SPBox3D *>(side->parent) : NULL;
+ return box ? box->persp_ref->getObject() : NULL;
}
Inkscape::XML::Node *box3d_side_convert_to_path(Box3DSide *side) {