Revision: 56941
http://sourceforge.net/p/brlcad/code/56941
Author: starseeker
Date: 2013-08-18 22:39:50 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
moving from rgb to color looks like it was a mistake - go back to rgb as the
'default'. Moving back could also introduce problems, so needs testing, but a
'proper' solution to all this will probably have to wait for v6/8.0
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-18 22:22:34 UTC (rev 56940)
+++ brlcad/trunk/src/librt/comb/comb.c 2013-08-18 22:39:50 UTC (rev 56941)
@@ -742,7 +742,18 @@
} 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-18 22:22:34 UTC (rev 56940)
+++ brlcad/trunk/src/librt/db5_types.c 2013-08-18 22:39:50 UTC (rev 56941)
@@ -289,7 +289,7 @@
case ATTR_LOS:
return "los";
case ATTR_COLOR:
- return "color";
+ return "rgb";
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.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
