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:
authorLukas Tönne <lukas.toenne@gmail.com>2015-04-20 11:37:01 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-04-20 11:37:01 +0300
commitbd5f946f39389dc2c4089b1f53f424c173c06410 (patch)
tree0c66c6e2c1e5df5a3fffe9b26a356a75e522b703
parent10df745d2195d4c1904cd141f151ad0c3726df6e (diff)
Fix for stupid MSVC, does not allow const expression as array size.
-rw-r--r--source/blender/blenkernel/intern/cache_library.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c
index aa0fc1fd0d7..7b49b08a5d8 100644
--- a/source/blender/blenkernel/intern/cache_library.c
+++ b/source/blender/blenkernel/intern/cache_library.c
@@ -919,7 +919,7 @@ static bool hairsim_find_data(HairSimCacheModifier *hsmd, DupliCache *dupcache,
static void hairsim_process(HairSimCacheModifier *hsmd, CacheProcessContext *ctx, CacheProcessData *data, int frame, int frame_prev, eCacheLibrary_EvalMode eval_mode)
{
- static const int MAX_CACHE_EFFECTORS = 64;
+#define MAX_CACHE_EFFECTORS 64
Object *ob;
Strands *strands;
@@ -958,6 +958,8 @@ static void hairsim_process(HairSimCacheModifier *hsmd, CacheProcessContext *ctx
pdEndEffectors(&effectors);
BKE_cache_effectors_free(cache_effectors, tot_cache_effectors);
BPH_mass_spring_solver_free(solver_data);
+
+#undef MAX_CACHE_EFFECTORS
}
CacheModifierTypeInfo cacheModifierType_HairSimulation = {