Blender Git Commit Log

Git Commits -> Revision 75846ce

Revision 75846ce by Jonathan deWerd (testbuild)
September 13, 2014, 21:05 (GMT)
Revert "Merge of SoC-NURBS: rhino import, analytic eval, trim support, uv trim editor, ux fixes."

This reverts commit 85a59690c092d7242fabd2164960a98f0661d3f8.

Commit Details:

Full Hash: 75846ce53d6b1723a3e5d8e1c4c8262aff73a8ba
Parent Commit: 85a5969
Lines Changed: +4911, -273288

1 Added Path:

/source/blender/blenkernel/intern/curve.c (+4495, -0) (View)

235 Deleted Paths:

/extern/opennurbs/CMakeLists.txt (+0, -258)
/extern/opennurbs/examples_linking_pragmas.h (+0, -67)
/extern/opennurbs/makefile (+0, -519)
/extern/opennurbs/opennurbs.h (+0, -138)
/extern/opennurbs/opennurbs_3dm.h (+0, -528)
/extern/opennurbs/opennurbs_3dm_attributes.cpp (+0, -1528)
/extern/opennurbs/opennurbs_3dm_attributes.h (+0, -573)
/extern/opennurbs/opennurbs_3dm_properties.cpp (+0, -598)
/extern/opennurbs/opennurbs_3dm_properties.h (+0, -142)
/extern/opennurbs/opennurbs_3dm_settings.cpp (+0, -4094)
/extern/opennurbs/opennurbs_3dm_settings.h (+0, -926)
/extern/opennurbs/opennurbs_annotation.cpp (+0, -732)
/extern/opennurbs/opennurbs_annotation.h (+0, -404)
/extern/opennurbs/opennurbs_annotation2.cpp (+0, -6870)
/extern/opennurbs/opennurbs_annotation2.h (+0, -2346)
/extern/opennurbs/opennurbs_arc.cpp (+0, -623)
/extern/opennurbs/opennurbs_arc.h (+0, -600)
/extern/opennurbs/opennurbs_arccurve.cpp (+0, -1181)
/extern/opennurbs/opennurbs_arccurve.h (+0, -425)
/extern/opennurbs/opennurbs_archive.cpp (+0, -15618)
/extern/opennurbs/opennurbs_archive.h (+0, -3084)
/extern/opennurbs/opennurbs_array.cpp (+0, -1532)
/extern/opennurbs/opennurbs_array.h (+0, -1832)
/extern/opennurbs/opennurbs_array_defs.h (+0, -1752)
/extern/opennurbs/opennurbs_base32.cpp (+0, -247)
/extern/opennurbs/opennurbs_base32.h (+0, -126)
/extern/opennurbs/opennurbs_base64.cpp (+0, -1088)
/extern/opennurbs/opennurbs_base64.h (+0, -345)
/extern/opennurbs/opennurbs_beam.cpp (+0, -5147)
/extern/opennurbs/opennurbs_beam.h (+0, -997)
/extern/opennurbs/opennurbs_bezier.cpp (+0, -3415)
/extern/opennurbs/opennurbs_bezier.h (+0, -1938)
/extern/opennurbs/opennurbs_beziervolume.cpp (+0, -1264)
/extern/opennurbs/opennurbs_bitmap.cpp (+0, -1060)
/extern/opennurbs/opennurbs_bitmap.h (+0, -600)
/extern/opennurbs/opennurbs_bounding_box.cpp (+0, -3310)
/extern/opennurbs/opennurbs_bounding_box.h (+0, -713)
/extern/opennurbs/opennurbs_box.cpp (+0, -258)
/extern/opennurbs/opennurbs_box.h (+0, -120)
/extern/opennurbs/opennurbs_brep.cpp (+0, -12156)
/extern/opennurbs/opennurbs_brep.h (+0, -4411)
/extern/opennurbs/opennurbs_brep_extrude.cpp (+0, -1278)
/extern/opennurbs/opennurbs_brep_io.cpp (+0, -1474)
/extern/opennurbs/opennurbs_brep_isvalid.cpp (+0, -1853)
/extern/opennurbs/opennurbs_brep_region.cpp (+0, -1216)
/extern/opennurbs/opennurbs_brep_tools.cpp (+0, -2870)
/extern/opennurbs/opennurbs_brep_v2valid.cpp (+0, -210)
/extern/opennurbs/opennurbs_circle.cpp (+0, -613)
/extern/opennurbs/opennurbs_circle.h (+0, -325)
/extern/opennurbs/opennurbs_color.cpp (+0, -255)
/extern/opennurbs/opennurbs_color.h (+0, -138)
/extern/opennurbs/opennurbs_compress.cpp (+0, -654)
/extern/opennurbs/opennurbs_compress.h (+0, -375)
/extern/opennurbs/opennurbs_cone.cpp (+0, -413)
/extern/opennurbs/opennurbs_cone.h (+0, -185)
/extern/opennurbs/opennurbs_crc.cpp (+0, -254)
/extern/opennurbs/opennurbs_crc.h (+0, -152)
/extern/opennurbs/opennurbs_curve.cpp (+0, -3037)
/extern/opennurbs/opennurbs_curve.h (+0, -1403)
/extern/opennurbs/opennurbs_curveonsurface.cpp (+0, -439)
/extern/opennurbs/opennurbs_curveonsurface.h (+0, -208)
/extern/opennurbs/opennurbs_curveproxy.cpp (+0, -1219)
/extern/opennurbs/opennurbs_curveproxy.h (+0, -472)
/extern/opennurbs/opennurbs_cylinder.cpp (+0, -369)
/extern/opennurbs/opennurbs_cylinder.h (+0, -152)
/extern/opennurbs/opennurbs_defines.cpp (+0, -2266)
/extern/opennurbs/opennurbs_defines.h (+0, -1710)
/extern/opennurbs/opennurbs_detail.cpp (+0, -190)
/extern/opennurbs/opennurbs_detail.h (+0, -95)
/extern/opennurbs/opennurbs_dimstyle.cpp (+0, -2342)
/extern/opennurbs/opennurbs_dimstyle.h (+0, -469)
/extern/opennurbs/opennurbs_dll.cpp (+0, -65)
/extern/opennurbs/opennurbs_dll_resource.h (+0, -14)
/extern/opennurbs/opennurbs_ellipse.cpp (+0, -465)
/extern/opennurbs/opennurbs_ellipse.h (+0, -135)
/extern/opennurbs/opennurbs_embedded_file.cpp (+0, -1859)
/extern/opennurbs/opennurbs_error.cpp (+0, -335)
/extern/opennurbs/opennurbs_error.h (+0, -137)
/extern/opennurbs/opennurbs_error_message.cpp (+0, -51)
/extern/opennurbs/opennurbs_evaluate_nurbs.cpp (+0, -1695)
/extern/opennurbs/opennurbs_evaluate_nurbs.h (+0, -381)
/extern/opennurbs/opennurbs_extensions.cpp (+0, -5454)
/extern/opennurbs/opennurbs_extensions.h (+0, -826)
/extern/opennurbs/opennurbs_font.cpp (+0, -658)
/extern/opennurbs/opennurbs_font.h (+0, -284)
/extern/opennurbs/opennurbs_fpoint.h (+0, -900)
/extern/opennurbs/opennurbs_fsp.cpp (+0, -553)
/extern/opennurbs/opennurbs_fsp.h (+0, -754)
/extern/opennurbs/opennurbs_fsp_defs.h (+0, -130)
/extern/opennurbs/opennurbs_geometry.cpp (+0, -254)
/extern/opennurbs/opennurbs_geometry.h (+0, -380)
/extern/opennurbs/opennurbs_gl.cpp (+0, -754)
/extern/opennurbs/opennurbs_gl.h (+0, -244)
/extern/opennurbs/opennurbs_group.cpp (+0, -118)
/extern/opennurbs/opennurbs_group.h (+0, -82)
/extern/opennurbs/opennurbs_hatch.cpp (+0, -1475)
/extern/opennurbs/opennurbs_hatch.h (+0, -833)
/extern/opennurbs/opennurbs_hsort_template.h (+0, -106)
/extern/opennurbs/opennurbs_instance.cpp (+0, -1702)
/extern/opennurbs/opennurbs_instance.h (+0, -448)
/extern/opennurbs/opennurbs_intersect.cpp (+0, -1088)
/extern/opennurbs/opennurbs_intersect.h (+0, -252)
/extern/opennurbs/opennurbs_knot.cpp (+0, -1404)
/extern/opennurbs/opennurbs_knot.h (+0, -492)
/extern/opennurbs/opennurbs_layer.cpp (+0, -2468)
/extern/opennurbs/opennurbs_layer.h (+0, -939)
/extern/opennurbs/opennurbs_light.cpp (+0, -908)
/extern/opennurbs/opennurbs_light.h (+0, -308)
/extern/opennurbs/opennurbs_line.cpp (+0, -534)
/extern/opennurbs/opennurbs_line.h (+0, -270)
/extern/opennurbs/opennurbs_linecurve.cpp (+0, -640)
/extern/opennurbs/opennurbs_linecurve.h (+0, -412)
/extern/opennurbs/opennurbs_linestyle.h (+0, -108)
/extern/opennurbs/opennurbs_linetype.cpp (+0, -361)
/extern/opennurbs/opennurbs_linetype.h (+0, -176)
/extern/opennurbs/opennurbs_lookup.cpp (+0, -1855)
/extern/opennurbs/opennurbs_lookup.h (+0, -434)
/extern/opennurbs/opennurbs_mapchan.h (+0, -233)
/extern/opennurbs/opennurbs_material.cpp (+0, -5191)
/extern/opennurbs/opennurbs_material.h (+0, -342)
/extern/opennurbs/opennurbs_math.cpp (+0, -4428)
/extern/opennurbs/opennurbs_math.h (+0, -2051)
/extern/opennurbs/opennurbs_matrix.cpp (+0, -1437)
/extern/opennurbs/opennurbs_matrix.h (+0, -607)
/extern/opennurbs/opennurbs_memory.c (+0, -125)
/extern/opennurbs/opennurbs_memory.h (+0, -102)
/extern/opennurbs/opennurbs_memory_util.c (+0, -96)
/extern/opennurbs/opennurbs_mesh.cpp (+0, -10253)
/extern/opennurbs/opennurbs_mesh.h (+0, -2669)
/extern/opennurbs/opennurbs_mesh_ngon.cpp (+0, -512)
/extern/opennurbs/opennurbs_mesh_tools.cpp (+0, -1291)
/extern/opennurbs/opennurbs_morph.cpp (+0, -537)
/extern/opennurbs/opennurbs_nurbscurve.cpp (+0, -3592)
/extern/opennurbs/opennurbs_nurbscurve.h (+0, -1165)
/extern/opennurbs/opennurbs_nurbssurface.cpp (+0, -3113)
/extern/opennurbs/opennurbs_nurbssurface.h (+0, -1980)
/extern/opennurbs/opennurbs_nurbsvolume.cpp (+0, -2923)
/extern/opennurbs/opennurbs_object.cpp (+0, -1791)
/extern/opennurbs/opennurbs_object.h (+0, -863)
/extern/opennurbs/opennurbs_object_history.cpp (+0, -2792)
/extern/opennurbs/opennurbs_object_history.h (+0, -328)
/extern/opennurbs/opennurbs_objref.cpp (+0, -1106)
/extern/opennurbs/opennurbs_objref.h (+0, -338)
/extern/opennurbs/opennurbs_offsetsurface.cpp (+0, -901)
/extern/opennurbs/opennurbs_offsetsurface.h (+0, -370)
/extern/opennurbs/opennurbs_optimize.cpp (+0, -585)
/extern/opennurbs/opennurbs_optimize.h (+0, -101)
/extern/opennurbs/opennurbs_photogrammetry.cpp (+0, -874)
/extern/opennurbs/opennurbs_photogrammetry.h (+0, -406)
/extern/opennurbs/opennurbs_plane.cpp (+0, -586)
/extern/opennurbs/opennurbs_plane.h (+0, -548)
/extern/opennurbs/opennurbs_planesurface.cpp (+0, -1154)
/extern/opennurbs/opennurbs_planesurface.h (+0, -658)
/extern/opennurbs/opennurbs_pluginlist.cpp (+0, -160)
/extern/opennurbs/opennurbs_pluginlist.h (+0, -73)
/extern/opennurbs/opennurbs_point.cpp (+0, -7730)
/extern/opennurbs/opennurbs_point.h (+0, -1589)
/extern/opennurbs/opennurbs_pointcloud.cpp (+0, -489)
/extern/opennurbs/opennurbs_pointcloud.h (+0, -239)
/extern/opennurbs/opennurbs_pointgeometry.cpp (+0, -151)
/extern/opennurbs/opennurbs_pointgeometry.h (+0, -113)
/extern/opennurbs/opennurbs_pointgrid.cpp (+0, -342)
/extern/opennurbs/opennurbs_pointgrid.h (+0, -194)
/extern/opennurbs/opennurbs_polycurve.cpp (+0, -3725)
/extern/opennurbs/opennurbs_polycurve.h (+0, -831)
/extern/opennurbs/opennurbs_polyedgecurve.cpp (+0, -841)
/extern/opennurbs/opennurbs_polyedgecurve.h (+0, -308)
/extern/opennurbs/opennurbs_polyline.cpp (+0, -368)
/extern/opennurbs/opennurbs_polyline.h (+0, -215)
/extern/opennurbs/opennurbs_polylinecurve.cpp (+0, -1268)
/extern/opennurbs/opennurbs_polylinecurve.h (+0, -578)
/extern/opennurbs/opennurbs_precompiledheader.cpp (+0, -132)
/extern/opennurbs/opennurbs_qsort_template.h (+0, -297)
/extern/opennurbs/opennurbs_quaternion.cpp (+0, -585)
/extern/opennurbs/opennurbs_quaternion.h (+0, -356)
/extern/opennurbs/opennurbs_rand.cpp (+0, -384)
/extern/opennurbs/opennurbs_rand.h (+0, -160)
/extern/opennurbs/opennurbs_rendering.h (+0, -218)
/extern/opennurbs/opennurbs_revsurface.cpp (+0, -2358)
/extern/opennurbs/opennurbs_revsurface.h (+0, -542)
/extern/opennurbs/opennurbs_rtree.cpp (+0, -3029)
/extern/opennurbs/opennurbs_rtree.h (+0, -690)
/extern/opennurbs/opennurbs_sort.cpp (+0, -264)
/extern/opennurbs/opennurbs_sphere.cpp (+0, -358)
/extern/opennurbs/opennurbs_sphere.h (+0, -127)
/extern/opennurbs/opennurbs_string.cpp (+0, -1824)
/extern/opennurbs/opennurbs_string.h (+0, -1128)
/extern/opennurbs/opennurbs_sum.cpp (+0, -204)
/extern/opennurbs/opennurbs_sumsurface.cpp (+0, -1162)
/extern/opennurbs/opennurbs_sumsurface.h (+0, -516)
/extern/opennurbs/opennurbs_surface.cpp (+0, -1541)
/extern/opennurbs/opennurbs_surface.h (+0, -918)
/extern/opennurbs/opennurbs_surfaceproxy.cpp (+0, -567)
/extern/opennurbs/opennurbs_surfaceproxy.h (+0, -383)
/extern/opennurbs/opennurbs_system.h (+0, -470)
/extern/opennurbs/opennurbs_textlog.cpp (+0, -831)
/extern/opennurbs/opennurbs_textlog.h (+0, -284)
/extern/opennurbs/opennurbs_texture.h (+0, -331)
/extern/opennurbs/opennurbs_texture_mapping.h (+0, -688)
/extern/opennurbs/opennurbs_torus.cpp (+0, -301)
/extern/opennurbs/opennurbs_torus.h (+0, -194)
/extern/opennurbs/opennurbs_unicode.cpp (+0, -1847)
/extern/opennurbs/opennurbs_unicode.h (+0, -1608)
/extern/opennurbs/opennurbs_userdata.cpp (+0, -1186)
/extern/opennurbs/opennurbs_userdata.h (+0, -406)
/extern/opennurbs/opennurbs_uuid.cpp (+0, -509)
/extern/opennurbs/opennurbs_uuid.h (+0, -311)
/extern/opennurbs/opennurbs_version.h (+0, -36)
/extern/opennurbs/opennurbs_viewport.cpp (+0, -4739)
/extern/opennurbs/opennurbs_viewport.h (+0, -1602)
/extern/opennurbs/opennurbs_workspace.cpp (+0, -282)
/extern/opennurbs/opennurbs_workspace.h (+0, -453)
/extern/opennurbs/opennurbs_wstring.cpp (+0, -2205)
/extern/opennurbs/opennurbs_xform.cpp (+0, -1964)
/extern/opennurbs/opennurbs_xform.h (+0, -1300)
/extern/opennurbs/opennurbs_zlib.cpp (+0, -1430)
/extern/opennurbs/opennurbs_zlib.h (+0, -146)
/extern/opennurbs/opennurbs_zlib_memory.cpp (+0, -39)
/extern/opennurbs/readme.txt (+0, -92)
/extern/opennurbs/SConscript (+0, -23)
/source/blender/blenkernel/BKE_surf_trimtess.h (+0, -17)
/source/blender/blenkernel/intern/curve.cpp (+0, -4900)
/source/blender/blenkernel/intern/curve_eval.cpp (+0, -474)
/source/blender/blenkernel/intern/surf_gridmesh.cpp (+0, -1360)
/source/blender/blenkernel/intern/surf_gridmesh.h (+0, -224)
/source/blender/editors/curve/poly.h (+0, -322)
/source/blender/editors/curve/poly_demo.cpp (+0, -501)
/source/blender/editors/curve/rast_demo.cpp (+0, -543)
/source/blender/editors/io/io_rhino_export.cpp (+0, -120)
/source/blender/editors/io/io_rhino_export.h (+0, -40)
/source/blender/editors/io/io_rhino_import.cpp (+0, -967)
/source/blender/editors/io/io_rhino_import.h (+0, -39)
/tests/interactive/curve_eval.h (+0, -90)
/tests/interactive/nurbs_derivative_eval.cpp (+0, -185)
/tests/interactive/nurbs_trimtess.cpp (+0, -624)

68 Modified Paths:

/build_files/cmake/macros.cmake (+0, -3) (Diff)
/build_files/scons/config/win32-mingw-config.py (+1, -1) (Diff)
/build_files/scons/config/win32-vc-config.py (+1, -1) (Diff)
/build_files/scons/config/win64-mingw-config.py (+1, -1) (Diff)
/build_files/scons/config/win64-vc-config.py (+1, -1) (Diff)
/build_files/scons/tools/Blender.py (+9, -0) (Diff)
/CMakeLists.txt (+1, -1) (Diff)
/extern/CMakeLists.txt (+0, -1) (Diff)
/extern/SConscript (+0, -1) (Diff)
/release/scripts/modules/bpy/utils.py (+1, -0) (Diff)
/release/scripts/presets/interface_theme/back_to_black.xml (+4, -4) (Diff)
/release/scripts/presets/interface_theme/elsyiun.xml (+4, -4) (Diff)
/release/scripts/presets/interface_theme/hexagon.xml (+4, -4) (Diff)
/release/scripts/presets/interface_theme/ubuntu_ambiance.xml (+4, -4) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+2, -47) (Diff)
/release/scripts/startup/bl_ui/space_info.py (+0, -2) (Diff)
/source/blender/blenkernel/BKE_curve.h (+1, -54) (Diff)
/source/blender/blenkernel/BKE_displist.h (+1, -2) (Diff)
/source/blender/blenkernel/BKE_mesh.h (+3, -0) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+2, -5) (Diff)
/source/blender/blenkernel/intern/displist.c (+23, -5) (Diff)
/source/blender/blenkernel/intern/mesh.c (+25, -10) (Diff)
/source/blender/blenkernel/SConscript (+1, -2) (Diff)
/source/blender/blenlib/intern/freetypefont.c (+0, -1) (Diff)
/source/blender/blenloader/intern/readfile.c (+15, -37) (Diff)
/source/blender/blenloader/intern/writefile.c (+18, -27) (Diff)
/source/blender/editors/curve/curve_ops.c (+1, -1) (Diff)
/source/blender/editors/curve/editcurve.c (+44, -197) (Diff)
/source/blender/editors/curve/editcurve_add.c (+5, -6) (Diff)
/source/blender/editors/gpencil/gpencil_edit.c (+0, -2) (Diff)
/source/blender/editors/include/ED_curve.h (+2, -2) (Diff)
/source/blender/editors/include/ED_image.h (+0, -1) (Diff)
/source/blender/editors/include/ED_screen.h (+0, -4) (Diff)
/source/blender/editors/include/ED_uvedit.h (+1, -2) (Diff)
/source/blender/editors/include/ED_view3d.h (+2, -2) (Diff)
/source/blender/editors/include/UI_resources.h (+0, -7) (Diff)
/source/blender/editors/interface/resources.c (+4, -22) (Diff)
/source/blender/editors/io/CMakeLists.txt (+53, -59) (Diff)
/source/blender/editors/io/io_ops.c (+0, -4) (Diff)
/source/blender/editors/io/SConscript (+2, -6) (Diff)
/source/blender/editors/mesh/editmesh_select.c (+8, -18) (Diff)
/source/blender/editors/object/object_add.c (+5, -12) (Diff)
/source/blender/editors/screen/screen_ops.c (+0, -33) (Diff)
/source/blender/editors/space_api/spacetypes.c (+0, -1) (Diff)
/source/blender/editors/space_image/image_draw.c (+6, -10) (Diff)
/source/blender/editors/space_image/image_edit.c (+0, -11) (Diff)
/source/blender/editors/space_image/image_intern.h (+0, -1) (Diff)
/source/blender/editors/space_image/image_ops.c (+2, -42) (Diff)
/source/blender/editors/space_image/space_image.c (+2, -12) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+90, -59) (Diff)
/source/blender/editors/space_view3d/view3d_buttons.c (+3, -3) (Diff)
/source/blender/editors/space_view3d/view3d_iterators.c (+6, -6) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+4, -7) (Diff)
/source/blender/editors/transform/transform_conversions.c (+4, -113) (Diff)
/source/blender/editors/transform/transform_generics.c (+1, -4) (Diff)
/source/blender/editors/transform/transform_ops.c (+0, -16) (Diff)
/source/blender/editors/util/ed_transverts.c (+1, -1) (Diff)
/source/blender/editors/uvedit/uvedit_draw.c (+15, -276) (Diff)
/source/blender/editors/uvedit/uvedit_intern.h (+0, -2) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+26, -830) (Diff)
/source/blender/makesdna/DNA_curve_types.h (+4, -61) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+0, -2) (Diff)
/source/blender/makesrna/intern/rna_curve.c (+1, -320) (Diff)
/source/blender/makesrna/intern/rna_space.c (+1, -13) (Diff)
/source/blender/makesrna/intern/rna_userdef.c (+0, -36) (Diff)
/source/blender/makesrna/SConscript (+0, -1) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+0, -1) (Diff)
/source/creator/CMakeLists.txt (+1, -234) (Diff)
By: Miika HämäläinenLast update: Nov-07-2014 14:18MiikaHweb | 2003-2021