diff options
| author | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-16 15:26:20 +0000 |
|---|---|---|
| committer | kamalpreetgrewal <grewalkamal005@gmail.com> | 2016-08-16 15:26:20 +0000 |
| commit | d242b8e3362e0a87c40177309a1141031d8d01f9 (patch) | |
| tree | 60795f1e5fdb8799fe57b9e189259dd2992e366a /src/sp-mesh-array.cpp | |
| parent | Add changes for compilation with trunk (diff) | |
| parent | Add Shift+drag to arc start and end knots, holding shift will now move both k... (diff) | |
| download | inkscape-d242b8e3362e0a87c40177309a1141031d8d01f9.tar.gz inkscape-d242b8e3362e0a87c40177309a1141031d8d01f9.zip | |
Merge changes from trunk
(bzr r14949.1.66)
Diffstat (limited to 'src/sp-mesh-array.cpp')
| -rw-r--r-- | src/sp-mesh-array.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/sp-mesh-array.cpp b/src/sp-mesh-array.cpp index 6bd5c85d7..0dd89ac96 100644 --- a/src/sp-mesh-array.cpp +++ b/src/sp-mesh-array.cpp @@ -1046,11 +1046,12 @@ void SPMeshNodeArray::create( SPMesh *mg, SPItem *item, Geom::OptRect bbox ) { if( !bbox ) { // Set default size to bounding box if size not given. std::cout << "SPMeshNodeArray::create(): bbox empty" << std::endl; - Geom::OptRect bbox = item->geometricBounds(); - } - if( !bbox ) { - std::cout << "SPMeshNodeArray::create: ERROR: No bounding box!" << std::endl; - return; + bbox = item->geometricBounds(); + + if( !bbox ) { + std::cout << "SPMeshNodeArray::create: ERROR: No bounding box!" << std::endl; + return; + } } Geom::Coord const width = bbox->dimensions()[Geom::X]; |