[Bf-blender-cvs] [8d89417] openvdb: Remove 'OPENVDB_USE_BLOSC' from SConscripts as well

Kévin Dietrich noreply at git.blender.org
Thu Sep 17 00:05:04 CEST 2015


Commit: 8d8941777814991b6d3016372c78c0ed7154753d
Author: Kévin Dietrich
Date:   Wed Sep 16 23:31:06 2015 +0200
Branches: openvdb
https://developer.blender.org/rB8d8941777814991b6d3016372c78c0ed7154753d

Remove 'OPENVDB_USE_BLOSC' from SConscripts as well

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

M	intern/openvdb/SConscript
M	source/blender/blenkernel/SConscript

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

diff --git a/intern/openvdb/SConscript b/intern/openvdb/SConscript
index f3479b7..e5de1f6 100644
--- a/intern/openvdb/SConscript
+++ b/intern/openvdb/SConscript
@@ -40,7 +40,6 @@ incs = ' '.join(incs)
 
 if env['WITH_BF_OPENVDB']:
     defs.append('WITH_OPENVDB')
-    defs.append('OPENVDB_USE_BLOSC')
 
     incs += ' ' + env['BF_BOOST_INC']
     incs += ' ' + env['BF_OPENEXR_INC']
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 90cd053..cef9d64 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -180,7 +180,6 @@ if env['WITH_BF_OPENSUBDIV']:
 
 if env['WITH_BF_OPENVDB']:
     defs.append('WITH_OPENVDB')
-    defs.append('OPENVDB_USE_BLOSC')
     incs += ' #/intern/openvdb'
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):




More information about the Bf-blender-cvs mailing list