Revision: 45944
http://brlcad.svn.sourceforge.net/brlcad/?rev=45944&view=rev
Author: bhinesley
Date: 2011-08-12 20:36:54 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
Disable error on the use of paths with len > 2. It was checking arguments it
shouldn't have been. It may be better off dead anyways; see note in file.
Modified Paths:
--------------
brlcad/trunk/src/libged/edit.c
Modified: brlcad/trunk/src/libged/edit.c
===================================================================
--- brlcad/trunk/src/libged/edit.c 2011-08-12 20:02:48 UTC (rev 45943)
+++ brlcad/trunk/src/libged/edit.c 2011-08-12 20:36:54 UTC (rev 45944)
@@ -1974,6 +1974,20 @@
/* detect >1 inner slashes */
first_slash = (char *)memchr((void *)path_start, '/',
(size_t)(path_end - path_start + 1));
+
+/* FIXME: This is an error for paths with > 2 directories, intended
+ * for target objects only; but the check for that was mistakenly
+ * never added. The point was to make it clear that supplying long
+ * paths would not make a matrix translation any more specific than
+ * PATH/OBJECT. However, this should be reconsidered, as accepting
+ * more paths could allow for the use of more specific default
+ * keypoints. Then again, using a short target object path and then
+ * a long keypoint would achieved the same end. In any case, this
+ * function has no way of knowing which objects are target objects,
+ * so this functionality belongs either in edit() or in certain
+ * subcommand functions.
+ */
+#if 0
if (first_slash && ((char *)memchr((void *)(first_slash + 1),
'/', (size_t)(path_end -
first_slash - 1)))) {
@@ -1986,11 +2000,12 @@
bu_vls_printf(gedp->ged_result_str, "invalid path, \"%s\"\n"
"It is only meaningful to have one or two "
"objects in a path in this context.\n"
- "Ex: OBJECT (equivalently, /OBJECT/) or "
- "PATH/OBJECT (equivalently, /PATH/OBJECT/)",
+ "Ex: OBJECT or PATH/OBJECT"
+ "(equivalently, /OBJECT/ or /PATH/OBJECT/)",
str);
return GED_ERROR;
}
+#endif
goto convert_obj;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
FREE DOWNLOAD - uberSVN with Social Coding for Subversion.
Subversion made easy with a complete admin console. Easy
to use, easy to manage, easy to install, easy to extend.
Get a Free download of the new open ALM Subversion platform now.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
