[brlcad-commits] SF.net SVN: brlcad:[45799] brlcad/trunk/src/librt/primitives/brep

[brlcad]

Revision: 45799
          http://brlcad.svn.sourceforge.net/brlcad/?rev=45799&view=rev
Author:   brlcad
Date:     2011-08-06 00:25:56 +0000 (Sat, 06 Aug 2011)

Log Message:
-----------
RED/GRN/BLU are defined by libbu, pick a different name for RED

Modified Paths:
--------------
    brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp
    brlcad/trunk/src/librt/primitives/brep/brep_debug.h

Modified: brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp       2011-08-05 
23:23:46 UTC (rev 45798)
+++ brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp       2011-08-06 
00:25:56 UTC (rev 45799)
@@ -122,7 +122,7 @@
        }
        /*
          if (bb->m_xgrow) {
-         M_COLOR_PLOT(RED);
+         M_COLOR_PLOT(PURERED);
          } else if (bb->m_ygrow) {
          M_COLOR_PLOT(GREEN);
          } else if (bb->m_zgrow) {
@@ -159,7 +159,7 @@
 
     ON_TextLog tl(stderr);
 
-    vhead = rt_vlblock_find(vbp, RED);
+    vhead = rt_vlblock_find(vbp, PURERED);
     RT_ADD_VLIST(vhead, min, BN_VLIST_LINE_MOVE);
     vhead = rt_vlblock_find(vbp, BLUE);
     RT_ADD_VLIST(vhead, min, BN_VLIST_LINE_MOVE);
@@ -169,7 +169,7 @@
     for (std::list<BBNode*>::iterator i = leaves.begin(); i != leaves.end(); 
i++) {
        BBNode* bb = dynamic_cast<BBNode*>(*i);
        if (bb->m_trimmed) {
-           vhead = rt_vlblock_find(vbp, RED);
+           vhead = rt_vlblock_find(vbp, PURERED);
        } else if (bb->m_checkTrim) {
            vhead = rt_vlblock_find(vbp, BLUE);
        } else {
@@ -200,7 +200,7 @@
 
     ON_TextLog tl(stderr);
 
-    vhead = rt_vlblock_find(vbp, RED);
+    vhead = rt_vlblock_find(vbp, PURERED);
     RT_ADD_VLIST(vhead, min, BN_VLIST_LINE_MOVE);
     vhead = rt_vlblock_find(vbp, BLUE);
     RT_ADD_VLIST(vhead, min, BN_VLIST_LINE_MOVE);
@@ -410,7 +410,7 @@
 
     ON_TextLog tl(stderr);
 
-    vhead = rt_vlblock_find(vbp, RED);
+    vhead = rt_vlblock_find(vbp, PURERED);
 
     surf->GetDomain(0, &umin, &umax);
     surf->GetDomain(1, &vmin, &vmax);

Modified: brlcad/trunk/src/librt/primitives/brep/brep_debug.h
===================================================================
--- brlcad/trunk/src/librt/primitives/brep/brep_debug.h 2011-08-05 23:23:46 UTC 
(rev 45798)
+++ brlcad/trunk/src/librt/primitives/brep/brep_debug.h 2011-08-06 00:25:56 UTC 
(rev 45799)
@@ -85,7 +85,7 @@
 #define LIGHTGOLDENROD 238, 221, 130
 #define DARKYELLOW 155, 155, 52
 #define LIGHTYELLOW 255, 255, 224
-#define RED 255, 0, 0
+#define PURERED 255, 0, 0
 #define GREEN 0, 255, 0
 #define BLUE 0, 0, 255
 #define YELLOW 255, 255, 0


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
BlackBerry&reg; DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts. 
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits