[Bf-blender-cvs] [85d8ff9] soc-2014-nurbs: Removed platform-dependant timing code to fix build.
Jonathan deWerd
noreply at git.blender.org
Mon Jul 28 00:08:52 CEST 2014
Commit: 85d8ff9f9677e4a93699ef22cf9af4bf95f8c140
Author: Jonathan deWerd
Date: Sun Jul 27 18:08:43 2014 -0400
Branches: soc-2014-nurbs
https://developer.blender.org/rB85d8ff9f9677e4a93699ef22cf9af4bf95f8c140
Removed platform-dependant timing code to fix build.
===================================================================
M source/blender/blenkernel/intern/curve.cpp
M source/blender/blenkernel/intern/displist.c
===================================================================
diff --git a/source/blender/blenkernel/intern/curve.cpp b/source/blender/blenkernel/intern/curve.cpp
index c3854d5..e78249d 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 9d741ec..4af7eb1 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);
}
More information about the Bf-blender-cvs
mailing list