Revision: 57120
http://sourceforge.net/p/brlcad/code/57120
Author: starseeker
Date: 2013-08-24 16:10:50 +0000 (Sat, 24 Aug 2013)
Log Message:
-----------
And changing from color back to rgb also has consequences (impacts red command
behavior).
Modified Paths:
--------------
brlcad/trunk/src/librt/comb/comb.c
brlcad/trunk/src/librt/db5_types.c
Modified: brlcad/trunk/src/librt/comb/comb.c
===================================================================
--- brlcad/trunk/src/librt/comb/comb.c 2013-08-24 16:05:53 UTC (rev 57119)
+++ brlcad/trunk/src/librt/comb/comb.c 2013-08-24 16:10:50 UTC (rev 57120)
@@ -742,18 +742,7 @@
} else {
bu_log("unable to parse 'rgb' attribute '%s'\n", ap);
}
- } else {
- if ((ap = bu_avs_get(&ip->idb_avs, "color")) != NULL) {
- int ibuf[3];
- if (sscanf(ap, "%d/%d/%d", ibuf, ibuf+1, ibuf+2) == 3) {
- VMOVE(comb->rgb, ibuf);
- comb->rgb_valid = 1;
- } else {
- bu_log("unable to parse 'color' attribute '%s'\n", ap);
- }
- }
}
-
if ((ap = bu_avs_get(&ip->idb_avs, db5_standard_attribute(ATTR_INHERIT)))
!= NULL) {
comb->inherit = atoi(ap);
}
Modified: brlcad/trunk/src/librt/db5_types.c
===================================================================
--- brlcad/trunk/src/librt/db5_types.c 2013-08-24 16:05:53 UTC (rev 57119)
+++ brlcad/trunk/src/librt/db5_types.c 2013-08-24 16:10:50 UTC (rev 57120)
@@ -289,7 +289,7 @@
case ATTR_LOS:
return "los";
case ATTR_COLOR:
- return "rgb";
+ return "color";
case ATTR_SHADER:
return "shader";
case ATTR_INHERIT:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
