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

[Kévin Dietrich]

Commit: 59a47ae091c66d983026d78b3e8fd637a30abd0b
Author: Kévin Dietrich
Date:   Sun Jan 17 14:45:33 2016 +0100
Branches: openvdb
https://developer.blender.org/rB59a47ae091c66d983026d78b3e8fd637a30abd0b

Merge branch 'master' into openvdb

Conflicts:
	source/blender/windowmanager/WM_api.h

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



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

diff --cc source/blender/windowmanager/WM_api.h
index 31e8c45,62ac4b2..aa82eb0
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -442,7 -442,8 +442,9 @@@ enum 
  	WM_JOB_TYPE_CLIP_PREFETCH,
  	WM_JOB_TYPE_SEQ_BUILD_PROXY,
  	WM_JOB_TYPE_SEQ_BUILD_PREVIEW,
+ 	WM_JOB_TYPE_POINTCACHE,
+ 	WM_JOB_TYPE_DPAINT_BAKE,
 +	WM_JOB_TYPE_OPENVDB_CACHE,
  	/* add as needed, screencast, seq proxy build
  	 * if having hard coded values is a problem */
  };