[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46900] trunk/blender/source/blenderplayer /bad_level_call_stubs/stubs.c: Fix for compiling with player after skin modifier commits.

Nicholas Bishop nicholasbishop at gmail.com
Tue May 22 17:55:02 CEST 2012


Revision: 46900
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46900
Author:   nicholasbishop
Date:     2012-05-22 15:55:02 +0000 (Tue, 22 May 2012)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c

Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2012-05-22 15:50:13 UTC (rev 46899)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2012-05-22 15:55:02 UTC (rev 46900)
@@ -122,15 +122,6 @@
 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) {}




More information about the Bf-blender-cvs mailing list