Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Forgot this in previous commit

Browse Source
This commit is contained in:
Sergey Sharybin
2014-06-26 15:29:16 +06:00
parent 6135556f45
commit 0503dc3d02
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/library.c
View File

@@ -1050,7 +1050,7 @@ Main *BKE_main_new(void)
bmain->eval_ctx = MEM_callocN(sizeof(EvaluationContext), bmain->eval_ctx = MEM_callocN(sizeof(EvaluationContext),
"EvaluationContext"); "EvaluationContext");
bmain->lock = MEM_mallocN(sizeof(SpinLock), "main lock"); bmain->lock = MEM_mallocN(sizeof(SpinLock), "main lock");
BLI_spin_init(bmain->lock); BLI_spin_init((SpinLock *)bmain->lock);
return bmain; return bmain;
} }
@@ -1113,7 +1113,7 @@ void BKE_main_free(Main *mainvar)
} }
} }
BLI_spin_end(mainvar->lock); BLI_spin_end((SpinLock *)mainvar->lock);
MEM_freeN(mainvar->lock); MEM_freeN(mainvar->lock);
MEM_freeN(mainvar->eval_ctx); MEM_freeN(mainvar->eval_ctx);
MEM_freeN(mainvar); MEM_freeN(mainvar);
@@ -1121,12 +1121,12 @@ void BKE_main_free(Main *mainvar)
void BKE_main_lock(struct Main *bmain) void BKE_main_lock(struct Main *bmain)
{ {
BLI_spin_lock(bmain->lock); BLI_spin_lock((SpinLock *) bmain->lock);
} }
void BKE_main_unlock(struct Main *bmain) void BKE_main_unlock(struct Main *bmain)
{ {
BLI_spin_unlock(bmain->lock); BLI_spin_unlock((SpinLock *) bmain->lock);
} }
/* ***************** ID ************************ */ /* ***************** ID ************************ */