X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fglobal.cpp;h=9ec2a7bba529187dd2040f1a6de2102a8a78a1dd;hb=eb39f1bb5e6518c5dc4f4dbd3c88912a97192e95;hp=f9e016fef6cd92e09ce0439750c9316476dc9678;hpb=790c1a6d97f73f7457c7fad7e82fa29e5b6accd5;p=architektonas

diff --git a/src/global.cpp b/src/global.cpp
index f9e016f..9ec2a7b 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -27,7 +27,6 @@ int Global::tool = TTNone;
 int Global::toolState = TSNone;
 
 double Global::gridSpacing;
-int Global::currentLayer = 0;
 Point Global::snapPoint;
 bool Global::snapPointIsValid = false;
 uint32_t Global::objectID = 1;
@@ -42,6 +41,7 @@ float Global::penWidth = 1.0;
 int Global::penStyle = 1;
 uint32_t Global::penColor = 0x000000;
 bool Global::penStamp = false;
+bool Global::penDropper = false;
 
 Point Global::intersectPoint[16]; // Overkill, yes
 double Global::intersectParam[16]; // Ditto
@@ -50,6 +50,6 @@ int Global::numIntersectParams = 0;
 
 int Global::activeLayer = 0;
 int Global::numLayers = 1;
-std::vector<bool> Global::layerHidden;
-std::vector<bool> Global::layerLocked;
-std::vector<std::string> Global::layerName;
+BVector Global::layerHidden;
+BVector Global::layerLocked;
+SVector Global::layerName;