Fix crash rendering grass_wind.blend from regression tests. The real

problem is that where_is_object is being called from multiple threads
but is not thread-safe, added a note about this problem, this commit
only solves the crash. Also remove the pushdata/popdata mechanism
that was being used here, using this kind of system is bound to give
problems with threading.

1 files changed, 0 insertions, 70 deletions

diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 6181712f1be..226aa82a36a 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -103,76 +103,6 @@ short ENDIAN_ORDER;
 
 char versionstr[48]= "";
 
-/* ************************************************ */
-/* pushpop facility: to store data temporally, FIFO! */
-
-ListBase ppmain={0, 0};
-
-typedef struct PushPop {
-	struct PushPop *next, *prev;
-	void *data;
-	int len;
-} PushPop;
-
-void pushdata(void *data, int len)
-{
-	PushPop *pp;
-	
-	pp= MEM_mallocN(sizeof(PushPop), "pushpop");
-	BLI_addtail(&ppmain, pp);
-	pp->data= MEM_mallocN(len, "pushpop");
-	pp->len= len;
-	memcpy(pp->data, data, len);
-}
-
-void popfirst(void *data)
-{
-	PushPop *pp;
-	
-	pp= ppmain.first;
-	if(pp) {
-		memcpy(data, pp->data, pp->len);
-		BLI_remlink(&ppmain, pp);
-		MEM_freeN(pp->data);
-		MEM_freeN(pp);
-	}
-	else printf("error in popfirst\n");
-}
-
-void poplast(void *data)
-{
-	PushPop *pp;
-	
-	pp= ppmain.last;
-	if(pp) {
-		memcpy(data, pp->data, pp->len);
-		BLI_remlink(&ppmain, pp);
-		MEM_freeN(pp->data);
-		MEM_freeN(pp);
-	}
-	else printf("error in poplast\n");
-}
-
-void free_pushpop()
-{
-	PushPop *pp;
-
-	pp= ppmain.first;
-	while(pp) {
-		BLI_remlink(&ppmain, pp);
-		MEM_freeN(pp->data);
-		MEM_freeN(pp);
-	}	
-}
-
-void pushpop_test()
-{
-	if(ppmain.first) printf("pushpop not empty\n");
-	free_pushpop();
-}
-
-
-
 /* ********** free ********** */
 
 /* only to be called on exit blender */