[Bf-blender-cvs] [dd67538] openvdb: Merge branch 'master' into openvdb

[Kévin Dietrich]

Commit: dd67538178690222600c47a9dd47b7502aca95bb
Author: Kévin Dietrich
Date:   Thu Aug 6 00:52:38 2015 +0200
Branches: openvdb
https://developer.blender.org/rBdd67538178690222600c47a9dd47b7502aca95bb

Merge branch 'master' into openvdb

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



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

diff --cc source/blender/editors/space_view3d/drawobject.c
index 029bd46,f8af238..1872491
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -74,7 -74,7 +74,8 @@@
  #include "BKE_particle.h"
  #include "BKE_pointcache.h"
  #include "BKE_scene.h"
 +#include "BKE_smoke.h"
+ #include "BKE_subsurf.h"
  #include "BKE_unit.h"
  #include "BKE_tracking.h"