Mercurial > ldforge / changeset

--- a/changelog.txt	Sun Jul 27 02:40:21 2014 +0300
+++ b/changelog.txt	Sun Jul 27 02:55:27 2014 +0300
@@ -77,7 +77,11 @@
 !	- Moved the uncolorize action into the color toolbar, replacing Main and Edge colors there.
 !	- Changed `<anonymous>` to `untitled`.
 !	- Grids now have a single coordinate snap value instead of individual X, Y and Z values.
-!	- Select by color and type now consider an object matching if one of the color/types match. The color/type of the existing selection does not need to be uniform anymore.
+!	- Select by color and type now consider an object matching if one of the color/types match. The
+		color/type of the existing selection does not need to be uniform anymore.
+!	- Removed the Non-CA license option. The CA license option is now a checkbox (disabling it 
+		means no license at all).
+
 
 
 

--- a/src/colors.cc	Sun Jul 27 02:40:21 2014 +0300
+++ b/src/colors.cc	Sun Jul 27 02:55:27 2014 +0300
@@ -68,7 +68,7 @@
 	if (index < countof (g_LDConfigColors) and g_LDConfigColors[index] != null)
 		return g_LDConfigColors[index];
 
-	if (index > 0x2000000)
+	if (index >= 0x2000000)
 	{
 		// Direct color
 		QColor col;
@@ -76,7 +76,7 @@
 		col.setGreen ((index & 0x000FF00) >> 8);
 		col.setBlue (index & 0x00000FF);
 
-		if (index > 0x3000000)
+		if (index >= 0x3000000)
 			col.setAlpha (128);
 
 		LDColorData* color = new LDColorData;