remove include paths which dont exist, fix for doc upload script which was getting the blender version twice and not working sometimes.

doc/python_api/sphinx_doc_gen.sh

@@ -15,7 +15,6 @@ blender_version=$(grep BLENDER_VERSION $blender_srcdir/source/blender/blenkernel
 blender_subversion=$(grep BLENDER_SUBVERSION $blender_srcdir/source/blender/blenkernel/BKE_blender.h | tr -dc 0-9)
 BLENDER_VERSION=$(expr $blender_version / 100)_$(expr $blender_version % 100)_$blender_subversion
 
-BLENDER_VERSION=`$BLENDER --version | cut -f2-4 -d" " | sed 's/(//g' | sed 's/)//g' | sed 's/ sub /./g' | sed 's/\./_/g'`
 SSH_UPLOAD_FULL=$SSH_UPLOAD/"blender_python_api_"$BLENDER_VERSION
 
 SPHINXBASE=doc/python_api/

intern/smoke/CMakeLists.txt

@@ -27,7 +27,6 @@
 SET(INC
 	intern
 	../memutil
-	../guardealloc
 	../../extern/bullet2/src
 	${PNG_INC}
 	${ZLIB_INC}

source/blender/blenlib/CMakeLists.txt

@@ -28,7 +28,6 @@ SET(INC
 	.
 	../makesdna
 	../blenkernel
-	../include
 	../gpu
 	../../../intern/ghost
 	../../../intern/guardedalloc

source/blender/blenloader/CMakeLists.txt

@@ -30,7 +30,6 @@ SET(INC
 	../blenkernel
 	../makesdna
 	../readblenfile
-	../include
 	../makesrna
 	../render/extern/include
 	../../../intern/guardedalloc

source/blender/gpu/CMakeLists.txt

@@ -28,7 +28,6 @@ SET(INC
 	.
 	../blenlib
 	../blenkernel
-	../include
 	../imbuf
 	../makesdna
 	../makesrna

source/blender/ikplugin/CMakeLists.txt

@@ -28,7 +28,6 @@ SET(INC
 	../blenlib
 	../makesdna
 	../blenkernel
-	../include
 	../ikplugin
 	../../../intern/guardedalloc
 	../../../intern/iksolver/extern

source/blender/render/CMakeLists.txt

@@ -36,7 +36,6 @@ SET(INC
 	../makesrna
 	../blenkernel
 	../imbuf
-	../include
 	../../kernel/gen_messaging
 	../../../intern/smoke/extern
 	../../../intern/guardedalloc

source/blender/windowmanager/CMakeLists.txt

@@ -33,7 +33,6 @@ SET(INC
 	../makesdna
 	../makesrna
 	../blenkernel
-	../include
 	../imbuf
 	../blenloader
 	../editors/include