From ce72482fe0e31786dbb2c6d3273cafe9b11f0800 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Wed, 11 Jun 2014 17:18:58 +0200 Subject: Fix for bug #1241902 (bzr r13418) --- src/box3d-side.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/box3d-side.cpp') diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp index dfccb63bf..a5e7eaa94 100644 --- a/src/box3d-side.cpp +++ b/src/box3d-side.cpp @@ -213,6 +213,8 @@ void Box3DSide::set_shape() { bool success = this->performPathEffect(c_lpe); if (success) { + sp_lpe_item_apply_to_mask(this); + sp_lpe_item_apply_to_clippath(this); this->setCurveInsync(c_lpe, TRUE); } -- cgit v1.2.3 From 6829ce76e2ab77859c1a5fdacbb2fa71109d65b0 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 27 Jun 2014 18:28:46 +0200 Subject: Remove the incorrect fix for the bug 1241902 (bzr r13441) --- src/box3d-side.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/box3d-side.cpp') diff --git a/src/box3d-side.cpp b/src/box3d-side.cpp index a5e7eaa94..dfccb63bf 100644 --- a/src/box3d-side.cpp +++ b/src/box3d-side.cpp @@ -213,8 +213,6 @@ void Box3DSide::set_shape() { bool success = this->performPathEffect(c_lpe); if (success) { - sp_lpe_item_apply_to_mask(this); - sp_lpe_item_apply_to_clippath(this); this->setCurveInsync(c_lpe, TRUE); } -- cgit v1.2.3 From e2ae473da92a1f96e307e3f1f3e206cad7bd1c38 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Thu, 23 Oct 2014 19:33:47 -0700 Subject: Initial removal of box3d outdated GTKish macros. (bzr r13634) --- src/box3d-side.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/box3d-side.cpp') 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 * Abhishek Sharma + * Jon A. Cruz * * 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(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(side->parent) : NULL; + return box ? box->persp_ref->getObject() : NULL; } Inkscape::XML::Node *box3d_side_convert_to_path(Box3DSide *side) { -- cgit v1.2.3