Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2012-05-22 19:55:02 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2012-05-22 19:55:02 +0400
commitd227d07112b9604f232223040a5ac4f15b1723d2 (patch)
treede6e724aad2f67d17677c77d220973079979aeb7 /source/blenderplayer
parent2d0c5b90179b14cd9d36807188e6cdca96e9124a (diff)
Fix for compiling with player after skin modifier commits.
Removed the bad_level_call_stubs for BLI_heap functions; player is being linked with blenlib, so this gives multiple-definition linker errors.
Diffstat (limited to 'source/blenderplayer')
-rw-r--r--source/blenderplayer/bad_level_call_stubs/stubs.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index aa243edd96e..4c0115bc794 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -122,15 +122,6 @@ void EDBM_mesh_make(struct ToolSettings *ts, struct Scene *scene, struct Object
void EDBM_mesh_normals_update(struct BMEditMesh *em) {}
void *g_system;
-struct Heap* BLI_heap_new (void){return NULL;}
-void BLI_heap_free(struct Heap *heap, void *ptrfreefp) {}
-struct HeapNode* BLI_heap_insert (struct Heap *heap, float value, void *ptr){return NULL;}
-void BLI_heap_remove(struct Heap *heap, struct HeapNode *node) {}
-int BLI_heap_empty(struct Heap *heap) {return 0;}
-int BLI_heap_size(struct Heap *heap){return 0;}
-struct HeapNode* BLI_heap_top (struct Heap *heap){return NULL;}
-void* BLI_heap_popmin (struct Heap *heap){return NULL;}
-
void BLI_smallhash_init(struct SmallHash *hash) {}
void BLI_smallhash_release(struct SmallHash *hash) {}
void BLI_smallhash_insert(struct SmallHash *hash, uintptr_t key, void *item) {}