Revision: 69080
          http://sourceforge.net/p/brlcad/code/69080
Author:   starseeker
Date:     2016-10-16 21:00:53 +0000 (Sun, 16 Oct 2016)
Log Message:
-----------
merge rt/nurb.h into nmg.h

Modified Paths:
--------------
    brlcad/trunk/include/nmg.h
    brlcad/trunk/include/rt/CMakeLists.txt
    brlcad/trunk/src/conv/dxf/dxf-g.c
    brlcad/trunk/src/conv/iges/iges_struct.h
    brlcad/trunk/src/conv/step/step-g/OpenNurbsInterfaces.cpp
    brlcad/trunk/src/libdm/dm_obj.c
    brlcad/trunk/src/libdm/labels.c
    brlcad/trunk/src/libged/edbot.c
    brlcad/trunk/src/libged/edpipe.c
    brlcad/trunk/src/libged/get_solid_kp.c
    brlcad/trunk/src/librt/bezier.c
    brlcad/trunk/src/librt/binunif/db5_bin.c
    brlcad/trunk/src/librt/oslo_calc.c
    brlcad/trunk/src/librt/oslo_map.c
    brlcad/trunk/src/librt/primitives/arb8/arb8.c
    brlcad/trunk/src/librt/primitives/bspline/bspline.cpp
    brlcad/trunk/src/librt/primitives/bspline/bspline_mirror.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_basis.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_bezier.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_bound.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_brep.cpp
    brlcad/trunk/src/librt/primitives/bspline/nurb_c2.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_copy.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_diff.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_flat.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_interp.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_knot.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_norm.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_plot.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_poly.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_ray.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_refine.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_reverse.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_solve.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_split.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_tess.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_trim.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_trim_util.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_util.c
    brlcad/trunk/src/librt/primitives/bspline/nurb_xsplit.c
    brlcad/trunk/src/librt/primitives/ell/ell.c
    brlcad/trunk/src/librt/primitives/extrude/extrude.c
    brlcad/trunk/src/librt/primitives/metaball/metaball.c
    brlcad/trunk/src/librt/primitives/metaball/metaball_tri.c
    brlcad/trunk/src/librt/primitives/mirror.c
    brlcad/trunk/src/librt/primitives/nmg/nmg.c
    brlcad/trunk/src/librt/primitives/nmg/nmg_copy.c
    brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
    brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c
    brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c
    brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c
    brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c
    brlcad/trunk/src/librt/primitives/nmg/nmg_pr.c
    brlcad/trunk/src/librt/primitives/nmg/nmg_rt_isect.c
    brlcad/trunk/src/librt/primitives/sketch/sketch.c
    brlcad/trunk/src/librt/primitives/tgc/tgc.c
    brlcad/trunk/src/libwdb/nurb.c
    brlcad/trunk/src/mged/chgmodel.c
    brlcad/trunk/src/mged/edars.c
    brlcad/trunk/src/mged/edpipe.c
    brlcad/trunk/src/mged/edsol.c
    brlcad/trunk/src/mged/tedit.c
    brlcad/trunk/src/proc-db/spltest.c
    brlcad/trunk/src/proc-db/tea.c
    brlcad/trunk/src/proc-db/tea_nmg.c
    brlcad/trunk/src/proc-db/tube.c
    brlcad/trunk/src/proc-db/wavy.c

Removed Paths:
-------------
    brlcad/trunk/include/rt/nurb.h

Modified: brlcad/trunk/include/nmg.h
===================================================================
--- brlcad/trunk/include/nmg.h  2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/include/nmg.h  2016-10-16 21:00:53 UTC (rev 69080)
@@ -36,10 +36,12 @@
 #include "common.h"
 
 /* interface headers */
+#include "vmath.h"
 #include "bu/list.h"
 #include "bu/log.h"
 #include "bu/magic.h"
 #include "bu/ptbl.h"
+#include "bn/plane.h"
 #include "bn/tol.h"
 #include "bn/vlist.h"
 #include "vmath.h"
@@ -825,6 +827,99 @@
 };
 #define NMG_CK_INTER_STRUCT(_p) NMG_CKMAG(_p, NMG_INTER_STRUCT_MAGIC, 
"nmg_inter_struct")
 
+
+
+/*NURBS*/
+
+#define RT_NURB_SPLIT_ROW 0
+#define RT_NURB_SPLIT_COL 1
+#define RT_NURB_SPLIT_FLAT 2
+
+/* Definition of NURB point types and coordinates
+ * Bit:          8765 4321 0
+ *       |nnnn|tttt|h
+ *                     h     - 1 if Homogeneous
+ *                     tttt  - point type
+ *                             1 = XY
+ *                             2 = XYZ
+ *                             3 = UV
+ *                             4 = Random data
+ *                             5 = Projected surface
+ *                     nnnnn - number of coordinates per point
+ *                             includes the rational coordinate
+ */
+
+/* point types */
+#define RT_NURB_PT_XY  1                       /**< @brief x, y coordinates */
+#define RT_NURB_PT_XYZ 2                       /**< @brief x, y, z coordinates 
*/
+#define RT_NURB_PT_UV  3                       /**< @brief trim u, v parameter 
space */
+#define RT_NURB_PT_DATA 4                      /**< @brief random data */
+#define RT_NURB_PT_PROJ        5                       /**< @brief Projected 
Surface */
+
+#define RT_NURB_PT_RATIONAL    1
+#define RT_NURB_PT_NONRAT      0
+
+#define RT_NURB_MAKE_PT_TYPE(n, t, h)  ((n<<5) | (t<<1) | h)
+#define RT_NURB_EXTRACT_COORDS(pt)     (pt>>5)
+#define RT_NURB_EXTRACT_PT_TYPE(pt)            ((pt>>1) & 0x0f)
+#define RT_NURB_IS_PT_RATIONAL(pt)             (pt & 0x1)
+#define RT_NURB_STRIDE(pt)             (RT_NURB_EXTRACT_COORDS(pt) * sizeof( 
fastf_t))
+
+#define DEBUG_NMG_SPLINE       0x00000100      /**< @brief 9 Splines */
+
+/* macros to check/validate a structure pointer
+ */
+#define NMG_CK_KNOT(_p)                BU_CKMAG(_p, RT_KNOT_VECTOR_MAGIC, 
"knot_vector")
+#define NMG_CK_CNURB(_p)       BU_CKMAG(_p, NMG_EDGE_G_CNURB_MAGIC, "cnurb")
+#define NMG_CK_SNURB(_p)       BU_CKMAG(_p, NMG_FACE_G_SNURB_MAGIC, "snurb")
+
+/* DEPRECATED */
+#define GET_CNURB(p/*, m*/) { \
+       BU_ALLOC((p), struct edge_g_cnurb); \
+       /* NMG_INCR_INDEX(p, m); */ \
+       BU_LIST_INIT( &(p)->l ); (p)->l.magic = NMG_EDGE_G_CNURB_MAGIC; \
+}
+
+/* DEPRECATED */
+#define GET_SNURB(p/*, m*/) { \
+       BU_ALLOC((p), struct face_g_snurb); \
+       /* NMG_INCR_INDEX(p, m); */ \
+       BU_LIST_INIT( &(p)->l ); (p)->l.magic = NMG_FACE_G_SNURB_MAGIC; \
+}
+
+
+/* ----- Internal structures ----- */
+
+struct nmg_nurb_poly {
+    struct nmg_nurb_poly * next;
+    point_t            ply[3];         /**< @brief Vertices */
+    fastf_t            uv[3][2];       /**< @brief U, V parametric values */
+};
+
+struct nmg_nurb_uv_hit {
+    struct nmg_nurb_uv_hit * next;
+    int                sub;
+    fastf_t            u;
+    fastf_t            v;
+};
+
+
+struct oslo_mat {
+    struct oslo_mat * next;
+    int                offset;
+    int                osize;
+    fastf_t            * o_vec;
+};
+
+/* --- new way */
+
+struct bezier_2d_list {
+    struct bu_list     l;
+    point2d_t  *ctl;
+};
+
+
+
 /* TODO - these structs and ray_in_rpp are versions of librt functionality,
  * and we need to think about how/where to merge them into a common function
  * and struct that are available to both libraries without introducing a
@@ -2522,6 +2617,171 @@
 
 RT_EXPORT extern void nmg_isect_ray_model(struct nmg_ray_data *rd, struct 
bu_list *vlfree);
 
+
+/***********************************************************************************/
+/*                        NURBS specific bits of NMG                           
    */
+/***********************************************************************************/
+
+/* TODO - this is another one of those data concepts common to librt and 
libnmg */
+struct nmg_curvature {
+    vect_t      crv_pdir;       /**< @brief Principle direction */
+    fastf_t     crv_c1;         /**< @brief curvature in principle dir */
+    fastf_t     crv_c2;         /**< @brief curvature in other direction */
+};
+
+/* nurb_basis.c */
+RT_EXPORT extern fastf_t nmg_nurb_basis_eval(struct knot_vector *knts, int 
interval,
+                                                int order, fastf_t mu);
+
+/* nurb_bezier.c */
+RT_EXPORT extern int nmg_nurb_bezier(struct bu_list *bezier_hd, const struct 
face_g_snurb * srf);
+RT_EXPORT extern int nmg_bez_check(const struct face_g_snurb * srf);
+RT_EXPORT extern int nurb_crv_is_bezier(const struct edge_g_cnurb *crv);
+RT_EXPORT extern void nurb_c_to_bezier(struct bu_list *clist, struct 
edge_g_cnurb *crv);
+
+/* nurb_bound.c */
+RT_EXPORT extern int nmg_nurb_s_bound(struct face_g_snurb *srf, point_t bmin, 
point_t bmax);
+RT_EXPORT extern int nmg_nurb_c_bound(struct edge_g_cnurb *crv, point_t bmin, 
point_t bmax);
+RT_EXPORT extern int nmg_nurb_s_check(struct face_g_snurb *srf);
+RT_EXPORT extern int nmg_nurb_c_check(struct edge_g_cnurb *crv);
+
+/* nurb_copy.c */
+RT_EXPORT extern struct face_g_snurb *nmg_nurb_scopy(const struct face_g_snurb 
*srf);
+RT_EXPORT extern struct edge_g_cnurb *nmg_nurb_crv_copy(const struct 
edge_g_cnurb * crv);
+
+/* nurb_diff.c */
+RT_EXPORT extern struct face_g_snurb *nmg_nurb_s_diff(const struct 
face_g_snurb *srf, int dir);
+RT_EXPORT extern struct edge_g_cnurb *nmg_nurb_c_diff(const struct 
edge_g_cnurb *crv);
+RT_EXPORT extern void nmg_nurb_mesh_diff(int order, const fastf_t *o_pts,
+                                            fastf_t *n_pts,
+                                            const fastf_t *knots, int 
o_stride, int n_stride,
+                                            int o_size, int pt_type);
+
+/* nurb_eval.c */
+RT_EXPORT extern void nmg_nurb_s_eval(const struct face_g_snurb *srf, fastf_t 
u, fastf_t v, fastf_t * final_value);
+RT_EXPORT extern void nmg_nurb_c_eval(const struct edge_g_cnurb *crv, fastf_t 
param, fastf_t * final_value);
+RT_EXPORT extern fastf_t *nmg_nurb_eval_crv(fastf_t *crv, int order,
+                                               fastf_t param,
+                                               const struct knot_vector 
*k_vec, int k_index, int coords);
+RT_EXPORT extern void nmg_nurb_pr_crv(fastf_t *crv, int c_size, int coords);
+
+/* nurb_flat.c */
+RT_EXPORT extern int nmg_nurb_s_flat(struct face_g_snurb *srf, fastf_t 
epsilon);
+RT_EXPORT extern fastf_t nmg_nurb_crv_flat(fastf_t *crv, int   size, int 
pt_type);
+
+/* nurb_knot.c */
+RT_EXPORT extern void nmg_nurb_kvknot(struct knot_vector *new_knots, int order,
+                                         fastf_t lower, fastf_t upper, int 
num);
+RT_EXPORT extern void nmg_nurb_kvmult(struct knot_vector *new_kv,
+                                         const struct knot_vector *kv,
+                                         int num, fastf_t val);
+RT_EXPORT extern void nmg_nurb_kvgen(struct knot_vector *kv,
+                                        fastf_t lower, fastf_t upper, int num);
+RT_EXPORT extern void nmg_nurb_kvmerge(struct knot_vector *new_knots,
+                                          const struct knot_vector *kv1,
+                                          const struct knot_vector *kv2);
+RT_EXPORT extern int nmg_nurb_kvcheck(fastf_t val, const struct knot_vector 
*kv);
+RT_EXPORT extern void nmg_nurb_kvextract(struct knot_vector *new_kv,
+                                            const struct knot_vector *kv,
+                                            int lower, int upper);
+RT_EXPORT extern void nmg_nurb_kvcopy(struct knot_vector *new_kv,
+                                         const struct knot_vector *old_kv);
+RT_EXPORT extern void nmg_nurb_kvnorm(struct knot_vector *kv);
+RT_EXPORT extern int nmg_nurb_knot_index(const struct knot_vector *kv, fastf_t 
k_value, int order);
+RT_EXPORT extern void nmg_nurb_gen_knot_vector(struct knot_vector *new_knots,
+                                                  int order, fastf_t lower, 
fastf_t upper);
+
+/* nurb_norm.c */
+RT_EXPORT extern void nmg_nurb_s_norm(struct face_g_snurb *srf, fastf_t u, 
fastf_t v, fastf_t * norm);
+
+/* nurb_c2.c */
+RT_EXPORT extern void nmg_nurb_curvature(struct nmg_curvature *cvp,
+                                            const struct face_g_snurb *srf, 
fastf_t u, fastf_t v);
+
+/* nurb_plot.c */
+RT_EXPORT extern void nmg_nurb_plot_snurb(FILE *fp, const struct face_g_snurb 
*srf);
+RT_EXPORT extern void nmg_nurb_plot_cnurb(FILE *fp, const struct edge_g_cnurb 
*crv);
+RT_EXPORT extern void nmg_nurb_s_plot(const struct face_g_snurb *srf);
+
+/* nurb_interp.c */
+RT_EXPORT extern void nmg_nurb_cinterp(struct edge_g_cnurb *crv, int order,
+                                          const fastf_t *data, int n);
+RT_EXPORT extern void nmg_nurb_sinterp(struct face_g_snurb *srf, int order,
+                                          const fastf_t *data, int ymax, int 
xmax);
+
+/* nurb_poly.c */
+RT_EXPORT extern struct nmg_nurb_poly *nmg_nurb_to_poly(struct face_g_snurb 
*srf);
+RT_EXPORT extern struct nmg_nurb_poly *nmg_nurb_mk_poly(fastf_t *v1, fastf_t 
*v2, fastf_t *v3,
+                    fastf_t uv1[2], fastf_t uv2[2], fastf_t uv3[2]);
+
+/* nurb_ray.c */
+RT_EXPORT extern struct face_g_snurb *nmg_nurb_project_srf(const struct 
face_g_snurb *srf,
+                                                              plane_t plane1, 
plane_t plane2);
+RT_EXPORT extern void nmg_nurb_clip_srf(const struct face_g_snurb *srf,
+                                           int dir, fastf_t *min, fastf_t 
*max);
+RT_EXPORT extern struct face_g_snurb *nmg_nurb_region_from_srf(const struct 
face_g_snurb *srf,
+                                                                  int dir, 
fastf_t param1, fastf_t param2);
+RT_EXPORT extern struct nmg_nurb_uv_hit *nmg_nurb_intersect(const struct 
face_g_snurb * srf,
+                                                              plane_t plane1, 
plane_t plane2, double uv_tol, struct bu_list *plist);
+
+/* nurb_refine.c */
+RT_EXPORT extern struct face_g_snurb *nmg_nurb_s_refine(const struct 
face_g_snurb *srf,
+                                                           int dir, struct 
knot_vector *kv);
+RT_EXPORT extern struct edge_g_cnurb *nmg_nurb_c_refine(const struct 
edge_g_cnurb * crv,
+                                                           struct knot_vector 
*kv);
+
+/* nurb_solve.c */
+RT_EXPORT extern void nmg_nurb_solve(fastf_t *mat_1, fastf_t *mat_2,
+                                        fastf_t *solution, int dim, int 
coords);
+RT_EXPORT extern void nmg_nurb_doolittle(fastf_t *mat_1, fastf_t *mat_2,
+                                            int row, int coords);
+RT_EXPORT extern void nmg_nurb_forw_solve(const fastf_t *lu, const fastf_t *b,
+                                             fastf_t *y, int n);
+RT_EXPORT extern void nmg_nurb_back_solve(const fastf_t *lu, const fastf_t *y,
+                                             fastf_t *x, int n);
+RT_EXPORT extern void nmg_nurb_p_mat(const fastf_t * mat, int dim);
+
+/* nurb_split.c */
+RT_EXPORT extern void nmg_nurb_s_split(struct bu_list *split_hd, const struct 
face_g_snurb *srf,
+                                          int dir);
+RT_EXPORT extern void nmg_nurb_c_split(struct bu_list *split_hd, const struct 
edge_g_cnurb *crv);
+
+/* nurb_trim.c */
+RT_EXPORT extern int nmg_uv_in_lu(const fastf_t u, const fastf_t v, const 
struct loopuse *lu);
+
+/* nurb_util.c */
+RT_EXPORT extern struct face_g_snurb *nmg_nurb_new_snurb(int u_order, int 
v_order,
+                                                            int n_u_knots, int 
n_v_knots,
+                                                            int n_rows, int 
n_cols, int pt_type);
+RT_EXPORT extern struct edge_g_cnurb *nmg_nurb_new_cnurb(int order, int 
n_knots,
+                                                            int n_pts, int 
pt_type);
+RT_EXPORT extern void nmg_nurb_free_snurb(struct face_g_snurb *srf);
+RT_EXPORT extern void nmg_nurb_free_cnurb(struct edge_g_cnurb * crv);
+RT_EXPORT extern void nmg_nurb_c_print(const struct edge_g_cnurb *crv);
+RT_EXPORT extern void nmg_nurb_s_print(char *c, const struct face_g_snurb 
*srf);
+RT_EXPORT extern void nmg_nurb_pr_kv(const struct knot_vector *kv);
+RT_EXPORT extern void nmg_nurb_pr_mesh(const struct face_g_snurb *m);
+RT_EXPORT extern void nmg_nurb_print_pt_type(int c);
+RT_EXPORT extern void nmg_nurb_clean_cnurb(struct edge_g_cnurb *crv);
+
+/* nurb_xsplit.c */
+RT_EXPORT extern struct face_g_snurb *nmg_nurb_s_xsplit(struct face_g_snurb 
*srf,
+                                                           fastf_t param, int 
dir);
+RT_EXPORT extern struct edge_g_cnurb *nmg_nurb_c_xsplit(struct edge_g_cnurb 
*crv, fastf_t param);
+
+/* oslo_calc.c */
+RT_EXPORT extern struct oslo_mat *nmg_nurb_calc_oslo(int order,
+                                                        const struct 
knot_vector *tau_kv,
+                                                        struct knot_vector 
*t_kv);
+RT_EXPORT extern void nmg_nurb_pr_oslo(struct oslo_mat *om);
+RT_EXPORT extern void nmg_nurb_free_oslo(struct oslo_mat *om);
+
+/* oslo_map.c */
+RT_EXPORT extern void nmg_nurb_map_oslo(struct oslo_mat *oslo,
+                                           fastf_t *old_pts, fastf_t *new_pts,
+                                           int o_stride, int n_stride,
+                                           int lower, int upper, int pt_type);
+
 __END_DECLS
 
 #endif /* NMG_H */

Modified: brlcad/trunk/include/rt/CMakeLists.txt
===================================================================
--- brlcad/trunk/include/rt/CMakeLists.txt      2016-10-16 20:43:55 UTC (rev 
69079)
+++ brlcad/trunk/include/rt/CMakeLists.txt      2016-10-16 21:00:53 UTC (rev 
69080)
@@ -33,7 +33,6 @@
   mem.h
   nmg.h
   nongeom.h
-  nurb.h
   op.h
   overlap.h
   pattern.h

Deleted: brlcad/trunk/include/rt/nurb.h
===================================================================
--- brlcad/trunk/include/rt/nurb.h      2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/include/rt/nurb.h      2016-10-16 21:00:53 UTC (rev 69080)
@@ -1,305 +0,0 @@
-/*                          N U R B . H
- * BRL-CAD
- *
- * Copyright (c) 1991-2016 United States Government as represented by
- * the U.S. Army Research Laboratory.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this file; see the file named COPYING for more
- * information.
- */
-/** @addtogroup rt_nurb */
-/** @{ */
-/** @file nurb.h
- *
- * @brief
- *     Define surface and curve structures for
- *     Non Rational Uniform B-Spline (NURB)
- *     curves and surfaces.
- *
- */
-
-#ifndef RT_NURB_H
-#define RT_NURB_H
-
-#include "common.h"
-
-#include "vmath.h"
-#include "bu/list.h"
-#include "bn/plane.h"
-#include "rt/defines.h"
-
-/* Define parametric directions for splitting. */
-
-#define RT_NURB_SPLIT_ROW 0
-#define RT_NURB_SPLIT_COL 1
-#define RT_NURB_SPLIT_FLAT 2
-
-/* Definition of NURB point types and coordinates
- * Bit:          8765 4321 0
- *       |nnnn|tttt|h
- *                     h     - 1 if Homogeneous
- *                     tttt  - point type
- *                             1 = XY
- *                             2 = XYZ
- *                             3 = UV
- *                             4 = Random data
- *                             5 = Projected surface
- *                     nnnnn - number of coordinates per point
- *                             includes the rational coordinate
- */
-
-/* point types */
-#define RT_NURB_PT_XY  1                       /**< @brief x, y coordinates */
-#define RT_NURB_PT_XYZ 2                       /**< @brief x, y, z coordinates 
*/
-#define RT_NURB_PT_UV  3                       /**< @brief trim u, v parameter 
space */
-#define RT_NURB_PT_DATA 4                      /**< @brief random data */
-#define RT_NURB_PT_PROJ        5                       /**< @brief Projected 
Surface */
-
-#define RT_NURB_PT_RATIONAL    1
-#define RT_NURB_PT_NONRAT      0
-
-#define RT_NURB_MAKE_PT_TYPE(n, t, h)  ((n<<5) | (t<<1) | h)
-#define RT_NURB_EXTRACT_COORDS(pt)     (pt>>5)
-#define RT_NURB_EXTRACT_PT_TYPE(pt)            ((pt>>1) & 0x0f)
-#define RT_NURB_IS_PT_RATIONAL(pt)             (pt & 0x1)
-#define RT_NURB_STRIDE(pt)             (RT_NURB_EXTRACT_COORDS(pt) * sizeof( 
fastf_t))
-
-#define DEBUG_NMG_SPLINE       0x00000100      /**< @brief 9 Splines */
-
-/* macros to check/validate a structure pointer
- */
-#define NMG_CK_KNOT(_p)                BU_CKMAG(_p, RT_KNOT_VECTOR_MAGIC, 
"knot_vector")
-#define NMG_CK_CNURB(_p)       BU_CKMAG(_p, NMG_EDGE_G_CNURB_MAGIC, "cnurb")
-#define NMG_CK_SNURB(_p)       BU_CKMAG(_p, NMG_FACE_G_SNURB_MAGIC, "snurb")
-
-/* DEPRECATED */
-#define GET_CNURB(p/*, m*/) { \
-       BU_ALLOC((p), struct edge_g_cnurb); \
-       /* NMG_INCR_INDEX(p, m); */ \
-       BU_LIST_INIT( &(p)->l ); (p)->l.magic = NMG_EDGE_G_CNURB_MAGIC; \
-}
-
-/* DEPRECATED */
-#define GET_SNURB(p/*, m*/) { \
-       BU_ALLOC((p), struct face_g_snurb); \
-       /* NMG_INCR_INDEX(p, m); */ \
-       BU_LIST_INIT( &(p)->l ); (p)->l.magic = NMG_FACE_G_SNURB_MAGIC; \
-}
-
-
-/* ----- Internal structures ----- */
-
-struct nmg_nurb_poly {
-    struct nmg_nurb_poly * next;
-    point_t            ply[3];         /**< @brief Vertices */
-    fastf_t            uv[3][2];       /**< @brief U, V parametric values */
-};
-
-struct nmg_nurb_uv_hit {
-    struct nmg_nurb_uv_hit * next;
-    int                sub;
-    fastf_t            u;
-    fastf_t            v;
-};
-
-
-struct oslo_mat {
-    struct oslo_mat * next;
-    int                offset;
-    int                osize;
-    fastf_t            * o_vec;
-};
-
-/* --- new way */
-
-struct bezier_2d_list {
-    struct bu_list     l;
-    point2d_t  *ctl;
-};
-
-__BEGIN_DECLS
-
-/* TODO - this is another one of those data concepts common to librt and 
libnmg */
-struct nmg_curvature {
-    vect_t      crv_pdir;       /**< @brief Principle direction */
-    fastf_t     crv_c1;         /**< @brief curvature in principle dir */
-    fastf_t     crv_c2;         /**< @brief curvature in other direction */
-};
-
-/* nurb_basis.c */
-RT_EXPORT extern fastf_t nmg_nurb_basis_eval(struct knot_vector *knts, int 
interval,
-                                                int order, fastf_t mu);
-
-/* nurb_bezier.c */
-RT_EXPORT extern int nmg_nurb_bezier(struct bu_list *bezier_hd, const struct 
face_g_snurb * srf);
-RT_EXPORT extern int nmg_bez_check(const struct face_g_snurb * srf);
-RT_EXPORT extern int nurb_crv_is_bezier(const struct edge_g_cnurb *crv);
-RT_EXPORT extern void nurb_c_to_bezier(struct bu_list *clist, struct 
edge_g_cnurb *crv);
-
-/* nurb_bound.c */
-RT_EXPORT extern int nmg_nurb_s_bound(struct face_g_snurb *srf, point_t bmin, 
point_t bmax);
-RT_EXPORT extern int nmg_nurb_c_bound(struct edge_g_cnurb *crv, point_t bmin, 
point_t bmax);
-RT_EXPORT extern int nmg_nurb_s_check(struct face_g_snurb *srf);
-RT_EXPORT extern int nmg_nurb_c_check(struct edge_g_cnurb *crv);
-
-/* nurb_copy.c */
-RT_EXPORT extern struct face_g_snurb *nmg_nurb_scopy(const struct face_g_snurb 
*srf);
-RT_EXPORT extern struct edge_g_cnurb *nmg_nurb_crv_copy(const struct 
edge_g_cnurb * crv);
-
-/* nurb_diff.c */
-RT_EXPORT extern struct face_g_snurb *nmg_nurb_s_diff(const struct 
face_g_snurb *srf, int dir);
-RT_EXPORT extern struct edge_g_cnurb *nmg_nurb_c_diff(const struct 
edge_g_cnurb *crv);
-RT_EXPORT extern void nmg_nurb_mesh_diff(int order, const fastf_t *o_pts,
-                                            fastf_t *n_pts,
-                                            const fastf_t *knots, int 
o_stride, int n_stride,
-                                            int o_size, int pt_type);
-
-/* nurb_eval.c */
-RT_EXPORT extern void nmg_nurb_s_eval(const struct face_g_snurb *srf, fastf_t 
u, fastf_t v, fastf_t * final_value);
-RT_EXPORT extern void nmg_nurb_c_eval(const struct edge_g_cnurb *crv, fastf_t 
param, fastf_t * final_value);
-RT_EXPORT extern fastf_t *nmg_nurb_eval_crv(fastf_t *crv, int order,
-                                               fastf_t param,
-                                               const struct knot_vector 
*k_vec, int k_index, int coords);
-RT_EXPORT extern void nmg_nurb_pr_crv(fastf_t *crv, int c_size, int coords);
-
-/* nurb_flat.c */
-RT_EXPORT extern int nmg_nurb_s_flat(struct face_g_snurb *srf, fastf_t 
epsilon);
-RT_EXPORT extern fastf_t nmg_nurb_crv_flat(fastf_t *crv, int   size, int 
pt_type);
-
-/* nurb_knot.c */
-RT_EXPORT extern void nmg_nurb_kvknot(struct knot_vector *new_knots, int order,
-                                         fastf_t lower, fastf_t upper, int 
num);
-RT_EXPORT extern void nmg_nurb_kvmult(struct knot_vector *new_kv,
-                                         const struct knot_vector *kv,
-                                         int num, fastf_t val);
-RT_EXPORT extern void nmg_nurb_kvgen(struct knot_vector *kv,
-                                        fastf_t lower, fastf_t upper, int num);
-RT_EXPORT extern void nmg_nurb_kvmerge(struct knot_vector *new_knots,
-                                          const struct knot_vector *kv1,
-                                          const struct knot_vector *kv2);
-RT_EXPORT extern int nmg_nurb_kvcheck(fastf_t val, const struct knot_vector 
*kv);
-RT_EXPORT extern void nmg_nurb_kvextract(struct knot_vector *new_kv,
-                                            const struct knot_vector *kv,
-                                            int lower, int upper);
-RT_EXPORT extern void nmg_nurb_kvcopy(struct knot_vector *new_kv,
-                                         const struct knot_vector *old_kv);
-RT_EXPORT extern void nmg_nurb_kvnorm(struct knot_vector *kv);
-RT_EXPORT extern int nmg_nurb_knot_index(const struct knot_vector *kv, fastf_t 
k_value, int order);
-RT_EXPORT extern void nmg_nurb_gen_knot_vector(struct knot_vector *new_knots,
-                                                  int order, fastf_t lower, 
fastf_t upper);
-
-/* nurb_norm.c */
-RT_EXPORT extern void nmg_nurb_s_norm(struct face_g_snurb *srf, fastf_t u, 
fastf_t v, fastf_t * norm);
-
-/* nurb_c2.c */
-RT_EXPORT extern void nmg_nurb_curvature(struct nmg_curvature *cvp,
-                                            const struct face_g_snurb *srf, 
fastf_t u, fastf_t v);
-
-/* nurb_plot.c */
-RT_EXPORT extern void nmg_nurb_plot_snurb(FILE *fp, const struct face_g_snurb 
*srf);
-RT_EXPORT extern void nmg_nurb_plot_cnurb(FILE *fp, const struct edge_g_cnurb 
*crv);
-RT_EXPORT extern void nmg_nurb_s_plot(const struct face_g_snurb *srf);
-
-/* nurb_interp.c */
-RT_EXPORT extern void nmg_nurb_cinterp(struct edge_g_cnurb *crv, int order,
-                                          const fastf_t *data, int n);
-RT_EXPORT extern void nmg_nurb_sinterp(struct face_g_snurb *srf, int order,
-                                          const fastf_t *data, int ymax, int 
xmax);
-
-/* nurb_poly.c */
-RT_EXPORT extern struct nmg_nurb_poly *nmg_nurb_to_poly(struct face_g_snurb 
*srf);
-RT_EXPORT extern struct nmg_nurb_poly *nmg_nurb_mk_poly(fastf_t *v1, fastf_t 
*v2, fastf_t *v3,
-                    fastf_t uv1[2], fastf_t uv2[2], fastf_t uv3[2]);
-
-/* nurb_ray.c */
-RT_EXPORT extern struct face_g_snurb *nmg_nurb_project_srf(const struct 
face_g_snurb *srf,
-                                                              plane_t plane1, 
plane_t plane2);
-RT_EXPORT extern void nmg_nurb_clip_srf(const struct face_g_snurb *srf,
-                                           int dir, fastf_t *min, fastf_t 
*max);
-RT_EXPORT extern struct face_g_snurb *nmg_nurb_region_from_srf(const struct 
face_g_snurb *srf,
-                                                                  int dir, 
fastf_t param1, fastf_t param2);
-RT_EXPORT extern struct nmg_nurb_uv_hit *nmg_nurb_intersect(const struct 
face_g_snurb * srf,
-                                                              plane_t plane1, 
plane_t plane2, double uv_tol, struct bu_list *plist);
-
-/* nurb_refine.c */
-RT_EXPORT extern struct face_g_snurb *nmg_nurb_s_refine(const struct 
face_g_snurb *srf,
-                                                           int dir, struct 
knot_vector *kv);
-RT_EXPORT extern struct edge_g_cnurb *nmg_nurb_c_refine(const struct 
edge_g_cnurb * crv,
-                                                           struct knot_vector 
*kv);
-
-/* nurb_solve.c */
-RT_EXPORT extern void nmg_nurb_solve(fastf_t *mat_1, fastf_t *mat_2,
-                                        fastf_t *solution, int dim, int 
coords);
-RT_EXPORT extern void nmg_nurb_doolittle(fastf_t *mat_1, fastf_t *mat_2,
-                                            int row, int coords);
-RT_EXPORT extern void nmg_nurb_forw_solve(const fastf_t *lu, const fastf_t *b,
-                                             fastf_t *y, int n);
-RT_EXPORT extern void nmg_nurb_back_solve(const fastf_t *lu, const fastf_t *y,
-                                             fastf_t *x, int n);
-RT_EXPORT extern void nmg_nurb_p_mat(const fastf_t * mat, int dim);
-
-/* nurb_split.c */
-RT_EXPORT extern void nmg_nurb_s_split(struct bu_list *split_hd, const struct 
face_g_snurb *srf,
-                                          int dir);
-RT_EXPORT extern void nmg_nurb_c_split(struct bu_list *split_hd, const struct 
edge_g_cnurb *crv);
-
-/* nurb_trim.c */
-RT_EXPORT extern int nmg_uv_in_lu(const fastf_t u, const fastf_t v, const 
struct loopuse *lu);
-
-/* nurb_util.c */
-RT_EXPORT extern struct face_g_snurb *nmg_nurb_new_snurb(int u_order, int 
v_order,
-                                                            int n_u_knots, int 
n_v_knots,
-                                                            int n_rows, int 
n_cols, int pt_type);
-RT_EXPORT extern struct edge_g_cnurb *nmg_nurb_new_cnurb(int order, int 
n_knots,
-                                                            int n_pts, int 
pt_type);
-RT_EXPORT extern void nmg_nurb_free_snurb(struct face_g_snurb *srf);
-RT_EXPORT extern void nmg_nurb_free_cnurb(struct edge_g_cnurb * crv);
-RT_EXPORT extern void nmg_nurb_c_print(const struct edge_g_cnurb *crv);
-RT_EXPORT extern void nmg_nurb_s_print(char *c, const struct face_g_snurb 
*srf);
-RT_EXPORT extern void nmg_nurb_pr_kv(const struct knot_vector *kv);
-RT_EXPORT extern void nmg_nurb_pr_mesh(const struct face_g_snurb *m);
-RT_EXPORT extern void nmg_nurb_print_pt_type(int c);
-RT_EXPORT extern void nmg_nurb_clean_cnurb(struct edge_g_cnurb *crv);
-
-/* nurb_xsplit.c */
-RT_EXPORT extern struct face_g_snurb *nmg_nurb_s_xsplit(struct face_g_snurb 
*srf,
-                                                           fastf_t param, int 
dir);
-RT_EXPORT extern struct edge_g_cnurb *nmg_nurb_c_xsplit(struct edge_g_cnurb 
*crv, fastf_t param);
-
-/* oslo_calc.c */
-RT_EXPORT extern struct oslo_mat *nmg_nurb_calc_oslo(int order,
-                                                        const struct 
knot_vector *tau_kv,
-                                                        struct knot_vector 
*t_kv);
-RT_EXPORT extern void nmg_nurb_pr_oslo(struct oslo_mat *om);
-RT_EXPORT extern void nmg_nurb_free_oslo(struct oslo_mat *om);
-
-/* oslo_map.c */
-RT_EXPORT extern void nmg_nurb_map_oslo(struct oslo_mat *oslo,
-                                           fastf_t *old_pts, fastf_t *new_pts,
-                                           int o_stride, int n_stride,
-                                           int lower, int upper, int pt_type);
-
-__END_DECLS
-
-#endif /* RT_NURB_H */
-
-/** @} */
-/*
- * Local Variables:
- * mode: C
- * tab-width: 8
- * indent-tabs-mode: t
- * c-file-style: "stroustrup"
- * End:
- * ex: shiftwidth=4 tabstop=8
- */

Modified: brlcad/trunk/src/conv/dxf/dxf-g.c
===================================================================
--- brlcad/trunk/src/conv/dxf/dxf-g.c   2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/conv/dxf/dxf-g.c   2016-10-16 21:00:53 UTC (rev 69080)
@@ -40,9 +40,9 @@
 #include "bu/list.h"
 #include "vmath.h"
 #include "bn.h"
+#include "nmg.h"
 #include "raytrace.h"
 #include "wdb.h"
-#include "rt/nurb.h"
 
 /* private headers */
 #include "./dxf.h"

Modified: brlcad/trunk/src/conv/iges/iges_struct.h
===================================================================
--- brlcad/trunk/src/conv/iges/iges_struct.h    2016-10-16 20:43:55 UTC (rev 
69079)
+++ brlcad/trunk/src/conv/iges/iges_struct.h    2016-10-16 21:00:53 UTC (rev 
69080)
@@ -31,7 +31,6 @@
 #include "vmath.h"
 #include "nmg.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 #include "rt/geom.h"
 #include "wdb.h"
 

Modified: brlcad/trunk/src/conv/step/step-g/OpenNurbsInterfaces.cpp
===================================================================
--- brlcad/trunk/src/conv/step/step-g/OpenNurbsInterfaces.cpp   2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/conv/step/step-g/OpenNurbsInterfaces.cpp   2016-10-16 
21:00:53 UTC (rev 69080)
@@ -33,7 +33,7 @@
 
 /* must come after nist step headers */
 #include "brep.h"
-#include "rt/nurb.h"
+#include "nmg.h"
 
 #include "STEPEntity.h"
 #include "Axis1Placement.h"

Modified: brlcad/trunk/src/libdm/dm_obj.c
===================================================================
--- brlcad/trunk/src/libdm/dm_obj.c     2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/libdm/dm_obj.c     2016-10-16 21:00:53 UTC (rev 69080)
@@ -42,7 +42,6 @@
 #include "raytrace.h"
 #include "nmg.h"
 #include "rt/geom.h"
-#include "rt/nurb.h"
 #include "rt/solid.h"
 #include "dm.h"
 #include "dm_private.h"

Modified: brlcad/trunk/src/libdm/labels.c
===================================================================
--- brlcad/trunk/src/libdm/labels.c     2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/libdm/labels.c     2016-10-16 21:00:53 UTC (rev 69080)
@@ -28,7 +28,6 @@
 #include "raytrace.h"
 #include "nmg.h"
 #include "rt/geom.h"
-#include "rt/nurb.h"
 #include "rt/solid.h"
 #include "dm.h"
 #include "dm_private.h"

Modified: brlcad/trunk/src/libged/edbot.c
===================================================================
--- brlcad/trunk/src/libged/edbot.c     2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/libged/edbot.c     2016-10-16 21:00:53 UTC (rev 69080)
@@ -30,7 +30,6 @@
 #include "nmg.h"
 #include "rt/geom.h"
 #include "ged.h"
-#include "rt/nurb.h"
 #include "wdb.h"
 
 

Modified: brlcad/trunk/src/libged/edpipe.c
===================================================================
--- brlcad/trunk/src/libged/edpipe.c    2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/libged/edpipe.c    2016-10-16 21:00:53 UTC (rev 69080)
@@ -37,7 +37,6 @@
 #include "nmg.h"
 #include "rt/geom.h"
 #include "ged.h"
-#include "rt/nurb.h"
 #include "wdb.h"
 
 

Modified: brlcad/trunk/src/libged/get_solid_kp.c
===================================================================
--- brlcad/trunk/src/libged/get_solid_kp.c      2016-10-16 20:43:55 UTC (rev 
69079)
+++ brlcad/trunk/src/libged/get_solid_kp.c      2016-10-16 21:00:53 UTC (rev 
69080)
@@ -26,9 +26,9 @@
 
 #include <string.h>
 
+#include "nmg.h"
 #include "raytrace.h"
 #include "wdb.h"
-#include "rt/nurb.h"
 #include "./ged_private.h"
 
 

Modified: brlcad/trunk/src/librt/bezier.c
===================================================================
--- brlcad/trunk/src/librt/bezier.c     2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/bezier.c     2016-10-16 21:00:53 UTC (rev 69080)
@@ -37,8 +37,8 @@
 #include "bio.h"
 
 #include "vmath.h"
+#include "nmg.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 
 #include "./librt_private.h"
 

Modified: brlcad/trunk/src/librt/binunif/db5_bin.c
===================================================================
--- brlcad/trunk/src/librt/binunif/db5_bin.c    2016-10-16 20:43:55 UTC (rev 
69079)
+++ brlcad/trunk/src/librt/binunif/db5_bin.c    2016-10-16 21:00:53 UTC (rev 
69080)
@@ -42,7 +42,6 @@
 #include "rt/db5.h"
 #include "rt/geom.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 
 
 /* size of each element (in bytes) for the different BINUNIF types */

Modified: brlcad/trunk/src/librt/oslo_calc.c
===================================================================
--- brlcad/trunk/src/librt/oslo_calc.c  2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/oslo_calc.c  2016-10-16 21:00:53 UTC (rev 69080)
@@ -41,8 +41,8 @@
 #include "bio.h"
 
 #include "vmath.h"
+#include "nmg.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 
 #define AMAX(i, j)    ((i) > (j) ? (i) : (j))
 #define AMIN(i, j)    ((i) < (j) ? (i) : (j))

Modified: brlcad/trunk/src/librt/oslo_map.c
===================================================================
--- brlcad/trunk/src/librt/oslo_map.c   2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/oslo_map.c   2016-10-16 21:00:53 UTC (rev 69080)
@@ -30,8 +30,8 @@
 #include "bio.h"
 
 #include "vmath.h"
+#include "nmg.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 
 /* This routine takes a oslo refinement matrix as described in the
  * paper "Making the Oslo Algorithm More Efficient" and maps it to the

Modified: brlcad/trunk/src/librt/primitives/arb8/arb8.c
===================================================================
--- brlcad/trunk/src/librt/primitives/arb8/arb8.c       2016-10-16 20:43:55 UTC 
(rev 69079)
+++ brlcad/trunk/src/librt/primitives/arb8/arb8.c       2016-10-16 21:00:53 UTC 
(rev 69080)
@@ -62,7 +62,6 @@
 #include "rt/geom.h"
 #include "rt/arb_edit.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 
 #include "../../librt_private.h"
 

Modified: brlcad/trunk/src/librt/primitives/bspline/bspline.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/bspline.cpp       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/bspline.cpp       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -45,11 +45,10 @@
 
 #include "bu/cv.h"
 #include "vmath.h"
+#include "nmg.h"
 #include "rt/db4.h"
 #include "rt/geom.h"
 #include "raytrace.h"
-#include "rt/nurb.h"           /* before nmg.h */
-#include "nmg.h"
 
 #ifdef CONVERT_TO_BREP
 #  include "opennurbs.h"

Modified: brlcad/trunk/src/librt/primitives/bspline/bspline_mirror.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/bspline_mirror.c  2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/bspline_mirror.c  2016-10-16 
21:00:53 UTC (rev 69080)
@@ -25,9 +25,9 @@
 
 #include "common.h"
 
+#include "nmg.h"
 #include "raytrace.h"
 #include "rt/geom.h"
-#include "rt/nurb.h"
 
 
 /**

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_basis.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_basis.c      2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_basis.c      2016-10-16 
21:00:53 UTC (rev 69080)
@@ -31,7 +31,6 @@
 
 #include "vmath.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 /**
  * This uses the traditional De Boor-Cox algorithm,

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_bezier.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_bezier.c     2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_bezier.c     2016-10-16 
21:00:53 UTC (rev 69080)
@@ -34,7 +34,6 @@
 #include "vmath.h"
 #include "bu/list.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 
 /**

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_bound.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_bound.c      2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_bound.c      2016-10-16 
21:00:53 UTC (rev 69080)
@@ -38,7 +38,6 @@
 #include "vmath.h"
 #include "bu/log.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 
 /**

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_brep.cpp     2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_brep.cpp     2016-10-16 
21:00:53 UTC (rev 69080)
@@ -25,9 +25,9 @@
 
 #include "common.h"
 
+#include "nmg.h"
 #include "raytrace.h"
 #include "rt/geom.h"
-#include "rt/nurb.h"
 #include "brep.h"
 
 

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_c2.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_c2.c 2016-10-16 20:43:55 UTC 
(rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_c2.c 2016-10-16 21:00:53 UTC 
(rev 69080)
@@ -34,7 +34,6 @@
 #include "vmath.h"
 #include "bn/mat.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 
 void

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_copy.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_copy.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_copy.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -32,7 +32,6 @@
 
 #include "vmath.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 struct face_g_snurb *
 nmg_nurb_scopy(const struct face_g_snurb *srf)

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_diff.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_diff.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_diff.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -32,9 +32,7 @@
 
 #include "vmath.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
-
 /**
  * Given a NURB surface and a direction, differentiate the surface and
  * return a new surface which is the derivative of the original

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_eval.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -35,9 +35,7 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
-
 /**
  * Algorithm -
  *

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_flat.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_flat.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_flat.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -35,7 +35,6 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 /* This doesn't seem to be used anymore: */
 /* extern fastf_t spl_crv_flat(); */

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_interp.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_interp.c     2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_interp.c     2016-10-16 
21:00:53 UTC (rev 69080)
@@ -35,9 +35,7 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
-
 void
 rt_nurb_nodes(fastf_t *nodes, const struct knot_vector *knots, int order)
 {

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_knot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_knot.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_knot.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -34,9 +34,7 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
-
 /**
  * nmg_nurb_kvknot()
  *

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_norm.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_norm.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_norm.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -33,9 +33,7 @@
 
 #include "vmath.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
-
 /**
  * If the order of the surface is linear either direction than
  * approximate it.

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_plot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_plot.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_plot.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -34,9 +34,7 @@
 #include "vmath.h"
 #include "bn/plot3.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
-
 void
 nmg_nurb_plot_snurb(FILE *fp, const struct face_g_snurb *srf)
 {

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_poly.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_poly.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_poly.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -34,10 +34,7 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/hit.h"
-#include "rt/nurb.h"
 
-
 /**
  * Algorithm -
  *

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_ray.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_ray.c        2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_ray.c        2016-10-16 
21:00:53 UTC (rev 69080)
@@ -33,7 +33,6 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 
 void rt_nurb_pbound(struct face_g_snurb *srf, fastf_t *vmin, fastf_t *vmax);

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_refine.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_refine.c     2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_refine.c     2016-10-16 
21:00:53 UTC (rev 69080)
@@ -35,9 +35,7 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
-
 /**
  * Returns a refined surface.  The original surface is unmodified.
  */

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_reverse.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_reverse.c    2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_reverse.c    2016-10-16 
21:00:53 UTC (rev 69080)
@@ -34,7 +34,6 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 void
 rt_nurb_reverse_srf(struct face_g_snurb *srf)

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_solve.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_solve.c      2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_solve.c      2016-10-16 
21:00:53 UTC (rev 69080)
@@ -41,9 +41,7 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
-
 /**
  * Solve must be passed two matrices that are of the form of pointer
  * to double arrays. mat_1 is the n by n matrix that is to be

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_split.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_split.c      2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_split.c      2016-10-16 
21:00:53 UTC (rev 69080)
@@ -35,9 +35,7 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
-
 /**
  * Algorithm
  *

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_tess.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_tess.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_tess.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -35,7 +35,6 @@
 
 #include "vmath.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 /**
  * Algorithm -

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_trim.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_trim.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_trim.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -33,7 +33,6 @@
 
 #include "vmath.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 extern void rt_clip_cnurb(struct bu_list *plist, struct edge_g_cnurb *crv, 
fastf_t u, fastf_t v);
 

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_trim_util.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_trim_util.c  2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_trim_util.c  2016-10-16 
21:00:53 UTC (rev 69080)
@@ -33,7 +33,6 @@
 
 #include "vmath.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 /**
  * Check to see if the curve control polygon wanders outside the

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_util.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_util.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_util.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -33,7 +33,6 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 /**
  * Create a place holder for a nurb surface.

Modified: brlcad/trunk/src/librt/primitives/bspline/nurb_xsplit.c
===================================================================
--- brlcad/trunk/src/librt/primitives/bspline/nurb_xsplit.c     2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/bspline/nurb_xsplit.c     2016-10-16 
21:00:53 UTC (rev 69080)
@@ -35,9 +35,7 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
-
 /**
  * Algorithm
  *

Modified: brlcad/trunk/src/librt/primitives/ell/ell.c
===================================================================
--- brlcad/trunk/src/librt/primitives/ell/ell.c 2016-10-16 20:43:55 UTC (rev 
69079)
+++ brlcad/trunk/src/librt/primitives/ell/ell.c 2016-10-16 21:00:53 UTC (rev 
69080)
@@ -38,7 +38,6 @@
 #include "nmg.h"
 #include "rt/geom.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 
 #include "../../librt_private.h"
 

Modified: brlcad/trunk/src/librt/primitives/extrude/extrude.c
===================================================================
--- brlcad/trunk/src/librt/primitives/extrude/extrude.c 2016-10-16 20:43:55 UTC 
(rev 69079)
+++ brlcad/trunk/src/librt/primitives/extrude/extrude.c 2016-10-16 21:00:53 UTC 
(rev 69080)
@@ -33,14 +33,13 @@
 #include <string.h>
 #include "bnetwork.h"
 
+#include "vmath.h"
 #include "bu/cv.h"
 #include "bu/debug.h"
-#include "vmath.h"
+#include "nmg.h"
 #include "rt/db4.h"
-#include "nmg.h"
 #include "rt/geom.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 
 #include "../../librt_private.h"
 

Modified: brlcad/trunk/src/librt/primitives/metaball/metaball.c
===================================================================
--- brlcad/trunk/src/librt/primitives/metaball/metaball.c       2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/metaball/metaball.c       2016-10-16 
21:00:53 UTC (rev 69080)
@@ -53,13 +53,12 @@
 #include <math.h>
 #include "bnetwork.h"
 
+#include "vmath.h"
 #include "bu/cv.h"
-#include "vmath.h"
+#include "nmg.h"
 #include "rt/db4.h"
-#include "nmg.h"
 #include "rt/geom.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 #include "wdb.h"
 
 #include "metaball.h"

Modified: brlcad/trunk/src/librt/primitives/metaball/metaball_tri.c
===================================================================
--- brlcad/trunk/src/librt/primitives/metaball/metaball_tri.c   2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/metaball/metaball_tri.c   2016-10-16 
21:00:53 UTC (rev 69080)
@@ -49,11 +49,10 @@
 #include "bio.h"
 
 #include "vmath.h"
+#include "nmg.h"
 #include "rt/db4.h"
-#include "nmg.h"
 #include "rt/geom.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 #include "wdb.h"
 
 #include "metaball.h"

Modified: brlcad/trunk/src/librt/primitives/mirror.c
===================================================================
--- brlcad/trunk/src/librt/primitives/mirror.c  2016-10-16 20:43:55 UTC (rev 
69079)
+++ brlcad/trunk/src/librt/primitives/mirror.c  2016-10-16 21:00:53 UTC (rev 
69080)
@@ -34,7 +34,7 @@
 #include "bn.h"
 
 #include "vmath.h"
-#include "rt/nurb.h"
+#include "nmg.h"
 
 
 /* FIXME: temporary until all mirror functions are migrated and the

Modified: brlcad/trunk/src/librt/primitives/nmg/nmg.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg.c 2016-10-16 20:43:55 UTC (rev 
69079)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg.c 2016-10-16 21:00:53 UTC (rev 
69080)
@@ -34,13 +34,12 @@
 #include <string.h>
 #include "bnetwork.h"
 
+#include "vmath.h"
 #include "bu/cv.h"
 #include "bg/polygon.h"
-#include "vmath.h"
+#include "nmg.h"
 #include "rt/db4.h"
-#include "nmg.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 #include "../../librt_private.h"
 
 /* rt_nmg_internal is just "model", from nmg.h */

Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_copy.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_copy.c    2016-10-16 20:43:55 UTC 
(rev 69079)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_copy.c    2016-10-16 21:00:53 UTC 
(rev 69080)
@@ -33,9 +33,7 @@
 
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
-
 static struct nmgregion_a *
 nmg_construct_region_a(const struct nmgregion_a *original, void **structArray)
 {

Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c    2016-10-16 20:43:55 UTC 
(rev 69079)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_fuse.c    2016-10-16 21:00:53 UTC 
(rev 69080)
@@ -41,7 +41,6 @@
 #include "bu/str.h"
 #include "bn/mat.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 
 extern int debug_file_count;

Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c    2016-10-16 20:43:55 UTC 
(rev 69079)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_misc.c    2016-10-16 21:00:53 UTC 
(rev 69080)
@@ -37,7 +37,6 @@
 #include "bu/malloc.h"
 #include "bn/mat.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 /* externed */
 uint32_t nmg_debug;

Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c      2016-10-16 20:43:55 UTC 
(rev 69079)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_mk.c      2016-10-16 21:00:53 UTC 
(rev 69080)
@@ -65,7 +65,6 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 
 /************************************************************************

Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c     2016-10-16 20:43:55 UTC 
(rev 69079)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_mod.c     2016-10-16 21:00:53 UTC 
(rev 69080)
@@ -35,7 +35,6 @@
 #include "vmath.h"
 #include "bu/malloc.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 void
 nmg_merge_regions(struct nmgregion *r1, struct nmgregion *r2, const struct 
bn_tol *tol)

Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c    2016-10-16 20:43:55 UTC 
(rev 69079)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_plot.c    2016-10-16 21:00:53 UTC 
(rev 69080)
@@ -52,7 +52,6 @@
 #include "bn/plot3.h"
 #include "bn/vlist.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 #define US_DELAY 10 /* Additional delay between frames */
 

Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_pr.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_pr.c      2016-10-16 20:43:55 UTC 
(rev 69079)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_pr.c      2016-10-16 21:00:53 UTC 
(rev 69080)
@@ -38,7 +38,6 @@
 #include "bu/malloc.h"
 #include "bu/str.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 
 static char nmg_pr_padstr[128];

Modified: brlcad/trunk/src/librt/primitives/nmg/nmg_rt_isect.c
===================================================================
--- brlcad/trunk/src/librt/primitives/nmg/nmg_rt_isect.c        2016-10-16 
20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/librt/primitives/nmg/nmg_rt_isect.c        2016-10-16 
21:00:53 UTC (rev 69080)
@@ -38,7 +38,6 @@
 #include "bn/mat.h"
 #include "bn/plot3.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 
 
 /* Plot a faceuse and a line between pt and plane_pt */

Modified: brlcad/trunk/src/librt/primitives/sketch/sketch.c
===================================================================
--- brlcad/trunk/src/librt/primitives/sketch/sketch.c   2016-10-16 20:43:55 UTC 
(rev 69079)
+++ brlcad/trunk/src/librt/primitives/sketch/sketch.c   2016-10-16 21:00:53 UTC 
(rev 69080)
@@ -43,7 +43,6 @@
 #include "nmg.h"
 #include "rt/geom.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 
 #include "../../librt_private.h"
 

Modified: brlcad/trunk/src/librt/primitives/tgc/tgc.c
===================================================================
--- brlcad/trunk/src/librt/primitives/tgc/tgc.c 2016-10-16 20:43:55 UTC (rev 
69079)
+++ brlcad/trunk/src/librt/primitives/tgc/tgc.c 2016-10-16 21:00:53 UTC (rev 
69080)
@@ -42,7 +42,6 @@
 #include "nmg.h"
 #include "rt/geom.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 
 #include "../../librt_private.h"
 

Modified: brlcad/trunk/src/libwdb/nurb.c
===================================================================
--- brlcad/trunk/src/libwdb/nurb.c      2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/libwdb/nurb.c      2016-10-16 21:00:53 UTC (rev 69080)
@@ -34,8 +34,8 @@
 #include "rt/db4.h"
 #include "vmath.h"
 #include "bn.h"
+#include "nmg.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 #include "rt/geom.h"
 #include "wdb.h"
 

Modified: brlcad/trunk/src/mged/chgmodel.c
===================================================================
--- brlcad/trunk/src/mged/chgmodel.c    2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/mged/chgmodel.c    2016-10-16 21:00:53 UTC (rev 69080)
@@ -37,7 +37,6 @@
 #include "bn.h"
 #include "raytrace.h"
 #include "nmg.h"
-#include "rt/nurb.h"
 #include "rt/geom.h"
 #include "ged.h"
 #include "wdb.h"

Modified: brlcad/trunk/src/mged/edars.c
===================================================================
--- brlcad/trunk/src/mged/edars.c       2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/mged/edars.c       2016-10-16 21:00:53 UTC (rev 69080)
@@ -29,7 +29,6 @@
 #include "vmath.h"
 #include "nmg.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 #include "rt/geom.h"
 #include "wdb.h"
 

Modified: brlcad/trunk/src/mged/edpipe.c
===================================================================
--- brlcad/trunk/src/mged/edpipe.c      2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/mged/edpipe.c      2016-10-16 21:00:53 UTC (rev 69080)
@@ -37,7 +37,6 @@
 #include "nmg.h"
 #include "rt/geom.h"
 #include "ged.h"
-#include "rt/nurb.h"
 #include "wdb.h"
 
 #include "./mged.h"

Modified: brlcad/trunk/src/mged/edsol.c
===================================================================
--- brlcad/trunk/src/mged/edsol.c       2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/mged/edsol.c       2016-10-16 21:00:53 UTC (rev 69080)
@@ -36,7 +36,6 @@
 #include "rt/geom.h"
 #include "raytrace.h"
 #include "rt/arb_edit.h"
-#include "rt/nurb.h"
 #include "wdb.h"
 #include "rt/db4.h"
 

Modified: brlcad/trunk/src/mged/tedit.c
===================================================================
--- brlcad/trunk/src/mged/tedit.c       2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/mged/tedit.c       2016-10-16 21:00:53 UTC (rev 69080)
@@ -34,7 +34,6 @@
 #include "vmath.h"
 #include "nmg.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 #include "rt/geom.h"
 
 #include "./mged.h"

Modified: brlcad/trunk/src/proc-db/spltest.c
===================================================================
--- brlcad/trunk/src/proc-db/spltest.c  2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/proc-db/spltest.c  2016-10-16 21:00:53 UTC (rev 69080)
@@ -30,8 +30,8 @@
 #include <math.h>
 
 #include "vmath.h"
+#include "nmg.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 #include "rt/geom.h"
 #include "wdb.h"
 

Modified: brlcad/trunk/src/proc-db/tea.c
===================================================================
--- brlcad/trunk/src/proc-db/tea.c      2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/proc-db/tea.c      2016-10-16 21:00:53 UTC (rev 69080)
@@ -30,8 +30,8 @@
 
 #include "bu/getopt.h"
 #include "vmath.h"             /* BRL-CAD Vector macros */
+#include "nmg.h"               /* BRL-CAD Spline data structures */
 #include "raytrace.h"
-#include "rt/nurb.h"           /* BRL-CAD Spline data structures */
 #include "wdb.h"
 
 #include "./tea.h"             /* Teapot Data */

Modified: brlcad/trunk/src/proc-db/tea_nmg.c
===================================================================
--- brlcad/trunk/src/proc-db/tea_nmg.c  2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/proc-db/tea_nmg.c  2016-10-16 21:00:53 UTC (rev 69080)
@@ -34,7 +34,6 @@
 #include "vmath.h"             /* BRL-CAD Vector macros */
 #include "nmg.h"
 #include "raytrace.h"
-#include "rt/nurb.h"           /* BRL-CAD Spline data structures */
 #include "wdb.h"
 
 #include "./tea.h"             /* Teapot Data */

Modified: brlcad/trunk/src/proc-db/tube.c
===================================================================
--- brlcad/trunk/src/proc-db/tube.c     2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/proc-db/tube.c     2016-10-16 21:00:53 UTC (rev 69080)
@@ -32,8 +32,8 @@
 #include <string.h>
 
 #include "vmath.h"
+#include "nmg.h"
 #include "raytrace.h"
-#include "rt/nurb.h"
 #include "wdb.h"
 
 

Modified: brlcad/trunk/src/proc-db/wavy.c
===================================================================
--- brlcad/trunk/src/proc-db/wavy.c     2016-10-16 20:43:55 UTC (rev 69079)
+++ brlcad/trunk/src/proc-db/wavy.c     2016-10-16 21:00:53 UTC (rev 69080)
@@ -29,10 +29,10 @@
 #include <math.h>
 #include "bio.h"
 
+#include "vmath.h"             /* BRL-CAD Vector macros */
 #include "bu/getopt.h"
-#include "vmath.h"             /* BRL-CAD Vector macros */
+#include "nmg.h"               /* BRL-CAD Vector macros */
 #include "raytrace.h"
-#include "rt/nurb.h"           /* BRL-CAD Spline data structures */
 #include "wdb.h"
 
 

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


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to