Commit: 4ed92d8b3124b9d64badae8e439b76e925bd92b9 Author: Kévin Dietrich Date: Sat Aug 29 02:17:56 2015 +0200 Branches: openvdb https://developer.blender.org/rB4ed92d8b3124b9d64badae8e439b76e925bd92b9
Merge branch 'master' into openvdb =================================================================== =================================================================== diff --cc source/blender/blenkernel/intern/smoke.c index 57ea523,4e2f6ed..3dc3d6c --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@@ -91,12 -91,10 +91,14 @@@ #include "smoke_API.h" +#ifdef WITH_OPENVDB +# include "openvdb_capi.h" +#endif + #ifdef WITH_SMOKE + static ThreadMutex object_update_lock = BLI_MUTEX_INITIALIZER; + #ifdef _WIN32 #include <time.h> #include <stdio.h> _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
