diff options
-rw-r--r-- | source/blender/blenkernel/intern/curve.cpp | 9 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 10 |
2 files changed, 6 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/curve.cpp b/source/blender/blenkernel/intern/curve.cpp index c3854d5061c..e78249dcf50 100644 --- a/source/blender/blenkernel/intern/curve.cpp +++ b/source/blender/blenkernel/intern/curve.cpp @@ -63,9 +63,6 @@ extern "C" { #include "BKE_material.h" } -#include <CoreServices/CoreServices.h> -#include <mach/mach.h> -#include <mach/mach_time.h> #include "surf_gridmesh.h" #include <map> @@ -582,8 +579,8 @@ void BKE_nurbList_free(ListBase *lb) BLI_listbase_clear(lb); } -void BKE_nurbList_duplicate(ListBase *lb) { - Nurb *nu; +ListBase *BKE_nurbList_duplicate(ListBase *lb) { + ListBase *newbase = (ListBase*)MEM_callocN(sizeof(ListBase),"NURBS duplicate listbase"); } Nurb *BKE_nurb_duplicate(Nurb *nu) @@ -623,7 +620,7 @@ Nurb *BKE_nurb_duplicate(Nurb *nu) } } } - BKE_nurbList_ + return newnu; } diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 9d741ecd307..4af7eb149fa 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -63,10 +63,6 @@ #include "BLI_sys_types.h" // for intptr_t support -#include <CoreServices/CoreServices.h> -#include <mach/mach.h> -#include <mach/mach_time.h> - static void boundbox_displist_object(Object *ob); void BKE_displist_elem_free(DispList *dl) @@ -1201,7 +1197,7 @@ void BKE_displist_make_surf(Scene *scene, Object *ob, ListBase *dispbase, DispList *dl; float *data; int len; - uint64_t timer_start = mach_absolute_time(); + /*uint64_t timer_start = mach_absolute_time();*/ if (!for_render && cu->editnurb) { BKE_nurbList_duplicate(&nubase, BKE_curve_editNurbs_get(cu)); @@ -1259,8 +1255,8 @@ void BKE_displist_make_surf(Scene *scene, Object *ob, ListBase *dispbase, for_render, use_render_resolution); } - uint64_t timer_stop = mach_absolute_time(); - int t = timer_stop-timer_start; + /*uint64_t timer_stop = mach_absolute_time(); + int t = timer_stop-timer_start;*/ nu = nubase.first; BKE_nurbList_free(&nubase); } |