[brlcad-commits] SF.net SVN: brlcad:[46991] brlcad/trunk/src/librt/comb/comb.c

[<sta...@us...>]

Revision: 46991
          http://brlcad.svn.sourceforge.net/brlcad/?rev=46991&view=rev
Author:   starseeker
Date:     2011-09-29 20:59:00 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
Gah.  Older versions of BRL-CAD are hard-coded to look for oshader in the attributes when importing combs.  This makes the particular label oshader an actual part of the .g file format itself, and NOT writing it out was breaking import of shaders when a .g file is created in a new version of BRL-CAD and subsequently opened in an older version.  Need to check what other hard-coded assumptions got accidently messed with.

Modified Paths:
--------------
    brlcad/trunk/src/librt/comb/comb.c

Modified: brlcad/trunk/src/librt/comb/comb.c
===================================================================
--- brlcad/trunk/src/librt/comb/comb.c	2011-09-29 18:50:46 UTC (rev 46990)
+++ brlcad/trunk/src/librt/comb/comb.c	2011-09-29 20:59:00 UTC (rev 46991)
@@ -398,10 +398,13 @@
 	bu_avs_remove(avsp, "rgb");
 
     /* optical shader string goes in an attribute */
-    if (bu_vls_strlen(&comb->shader) > 0)
+    if (bu_vls_strlen(&comb->shader) > 0) {
 	bu_avs_add_vls(avsp, "shader", &comb->shader);
-    else
+	bu_avs_add_vls(avsp, "oshader", &comb->shader);
+    } else {
 	bu_avs_remove(avsp, "shader");
+	bu_avs_remove(avsp, "oshader");
+    }
 
     /* GIFT compatability */
     if (comb->region_id != 0) {

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