[brlcad-commits] SF.net SVN: brlcad:[45747] brlcad/branches/STABLE/src

[starseeker]

Revision: 45747
          http://brlcad.svn.sourceforge.net/brlcad/?rev=45747&view=rev
Author:   starseeker
Date:     2011-08-01 20:29:27 +0000 (Mon, 01 Aug 2011)

Log Message:
-----------
Add a few bugfix patches to STABLE.

Modified Paths:
--------------
    brlcad/branches/STABLE/src/libged/erase.c
    brlcad/branches/STABLE/src/libged/mater.c
    brlcad/branches/STABLE/src/librt/primitives/ars/ars.c

Modified: brlcad/branches/STABLE/src/libged/erase.c
===================================================================
--- brlcad/branches/STABLE/src/libged/erase.c   2011-08-01 20:29:15 UTC (rev 
45746)
+++ brlcad/branches/STABLE/src/libged/erase.c   2011-08-01 20:29:27 UTC (rev 
45747)
@@ -193,12 +193,10 @@
     struct ged_display_list *new_gdlp;
     char *pathname;
     int savelen;
-    int newlen = path->fp_len + 1;
 
-    if (newlen < 3) {
+    if (path->fp_len < 3) {
        while (BU_LIST_WHILE(sp, solid, &gdlp->gdl_headSolid)) {
            savelen = sp->s_fullpath.fp_len;
-           sp->s_fullpath.fp_len = newlen;
            pathname = db_path_to_string(&sp->s_fullpath);
            sp->s_fullpath.fp_len = savelen;
 
@@ -215,7 +213,6 @@
 
            if (db_full_path_match_top(path, &sp->s_fullpath)) {
                savelen = sp->s_fullpath.fp_len;
-               sp->s_fullpath.fp_len = newlen;
                pathname = db_path_to_string(&sp->s_fullpath);
                sp->s_fullpath.fp_len = savelen;
 

Modified: brlcad/branches/STABLE/src/libged/mater.c
===================================================================
--- brlcad/branches/STABLE/src/libged/mater.c   2011-08-01 20:29:15 UTC (rev 
45746)
+++ brlcad/branches/STABLE/src/libged/mater.c   2011-08-01 20:29:27 UTC (rev 
45747)
@@ -39,7 +39,7 @@
        "R, G, B color values (0 to 255)? ('del' to delete, '.' to skip) ",
        "G component color value? ('.' to skip) ",
        "B component color value? ('.' to skip) ",
-       "Should this object's shader override lower nodes? ('.' to skip) "
+       "Should this object's shader override lower nodes? ([y/n] or '.' to 
skip) "
     };
 
     struct directory *dp = NULL;
@@ -210,8 +210,8 @@
        comb->rgb_valid = 1;
     }
 
-    if (!BU_STR_EQUAL(argv[6], ".")) {
-       comb->inherit = bu_str_true(argv[6]);
+    if (!BU_STR_EQUAL(argv[argc - 1], ".")) {
+       comb->inherit = bu_str_true(argv[argc - 1]);
        if (comb->inherit > 1) {
            bu_vls_printf(gedp->ged_result_str, "Inherit value should be 0 or 
1");
            rt_db_free_internal(&intern);

Modified: brlcad/branches/STABLE/src/librt/primitives/ars/ars.c
===================================================================
--- brlcad/branches/STABLE/src/librt/primitives/ars/ars.c       2011-08-01 
20:29:15 UTC (rev 45746)
+++ brlcad/branches/STABLE/src/librt/primitives/ars/ars.c       2011-08-01 
20:29:27 UTC (rev 45747)
@@ -655,8 +655,10 @@
     /* Compute "geometry" for region and shell */
     nmg_region_a(*r, tol);
 
+#ifdef TRI_PROTOTYPE
     nmg_shell_coplanar_face_merge(s, tol, 0);
     nmg_simplify_shell(s);
+#endif
 
     return 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