Merged changes in the trunk up to revision 47056.

Conflicts resolved:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/convertblender.c

source/creator/CMakeLists.txt

@@ -39,7 +39,6 @@ blender_include_dirs(
 	../blender/gpu
 	../blender/freestyle
 	../blender/windowmanager
-	../blender/opencl
 )
 
 if(WIN32)