[Bf-blender-cvs] [0503dc3] master: Forgot this in previous commit
Sergey Sharybin
noreply at git.blender.org
Thu Jun 26 11:29:37 CEST 2014
Commit: 0503dc3d021bbb98a0b3a5fa9878f0a0436adcee
Author: Sergey Sharybin
Date: Thu Jun 26 15:29:16 2014 +0600
https://developer.blender.org/rB0503dc3d021bbb98a0b3a5fa9878f0a0436adcee
Forgot this in previous commit
===================================================================
M source/blender/blenkernel/intern/library.c
===================================================================
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index a5c52e9..c8173ae 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1050,7 +1050,7 @@ Main *BKE_main_new(void)
bmain->eval_ctx = MEM_callocN(sizeof(EvaluationContext),
"EvaluationContext");
bmain->lock = MEM_mallocN(sizeof(SpinLock), "main lock");
- BLI_spin_init(bmain->lock);
+ BLI_spin_init((SpinLock *)bmain->lock);
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->eval_ctx);
MEM_freeN(mainvar);
@@ -1121,12 +1121,12 @@ void BKE_main_free(Main *mainvar)
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)
{
- BLI_spin_unlock(bmain->lock);
+ BLI_spin_unlock((SpinLock *) bmain->lock);
}
/* ***************** ID ************************ */
More information about the Bf-blender-cvs
mailing list