[Bf-blender-cvs] [876c8e2] gooseberry: Fix for linking order in scons preventing correct initialization of the Alembic caching implementation.

[Lukas Tönne]

Commit: 876c8e2267c684a056939c3ddba9e438e0e8e314
Author: Lukas Tönne
Date:   Mon Mar 23 18:04:19 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB876c8e2267c684a056939c3ddba9e438e0e8e314

Fix for linking order in scons preventing correct initialization of
the Alembic caching implementation.

===================================================================

M	source/blender/pointcache/SConscript
M	source/blender/pointcache/alembic/SConscript

===================================================================

diff --git a/source/blender/pointcache/SConscript b/source/blender/pointcache/SConscript
index a250c25..4b18b6f 100644
--- a/source/blender/pointcache/SConscript
+++ b/source/blender/pointcache/SConscript
@@ -48,9 +48,8 @@ if env['WITH_BF_INTERNATIONAL']:
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs.append(env['BF_PTHREADS_INC'])
 
-env.BlenderLib('bf_pointcache', sources, incs, defines=defs, libtype=['core','player'], priority=[900,900])
-
 if env['WITH_BF_ALEMBIC']:
     defs.append('WITH_PTC_ALEMBIC')
-
     SConscript(['alembic/SConscript'])
+
+env.BlenderLib('bf_pointcache', sources, incs, defines=defs, libtype=['core','player'], priority=[902,902])
diff --git a/source/blender/pointcache/alembic/SConscript b/source/blender/pointcache/alembic/SConscript
index c5ed795..47fbafe 100644
--- a/source/blender/pointcache/alembic/SConscript
+++ b/source/blender/pointcache/alembic/SConscript
@@ -51,10 +51,9 @@ if env['WITH_BF_INTERNATIONAL']:
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
     incs.append(env['BF_PTHREADS_INC'])
 
-if env['WITH_BF_ALEMBIC']:
-    incs.append(env['BF_OPENEXR_INC'])
-    incs.append(env['BF_ALEMBIC_INC'])
+incs.append(env['BF_OPENEXR_INC'])
+incs.append(env['BF_ALEMBIC_INC'])
 
-    defs.append('WITH_ALEMBIC')
+defs.append('WITH_ALEMBIC')
 
 env.BlenderLib('bf_pointcache_alembic', sources, incs, defines=defs, libtype=['core','player'], priority=[901, 901])