SLIM: Fix uppercase folder name in CMake file

Since area lights are affected by scaling them, it only makes sense to support applying the scale to the lamp size.
Of course, applying location or rotation does not work.

If a scaling that changes the aspect ratio is applied to a square lamp, the mode is automatically changed to Rectangle.

.arcconfig

@@ -1,6 +1,6 @@
 {
 	"project_id" : "Blender",
 	"conduit_uri" : "https://developer.blender.org/",
-	"git.default-relative-commit" : "origin/blender2.8",
+	"git.default-relative-commit" : "origin/master",
 	"arc.land.update.default" : "rebase"
 }

.gitmodules

@@ -1,24 +1,20 @@
 [submodule "release/scripts/addons"]
 	path = release/scripts/addons
 	url = ../blender-addons.git
-	branch = blender2.8
 	ignore = all
 	branch = master
 [submodule "release/scripts/addons_contrib"]
 	path = release/scripts/addons_contrib
 	url = ../blender-addons-contrib.git
-	branch = master
 	ignore = all
 	branch = master
 [submodule "release/datafiles/locale"]
 	path = release/datafiles/locale
 	url = ../blender-translations.git
-	branch = master
 	ignore = all
 	branch = master
 [submodule "source/tools"]
 	path = source/tools
 	url = ../blender-dev-tools.git
-	branch = master
 	ignore = all
 	branch = master

CMakeLists.txt

@@ -244,8 +244,6 @@ endif()
 option(WITH_PLAYER        "Build Player" OFF)
 option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ${_init_OPENCOLORIO})
 
-option(WITH_CLAY_ENGINE    "Enable Clay engine" ON)
-
 # Compositor
 option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
 
@@ -390,14 +388,10 @@ if(UNIX AND NOT APPLE)
 endif()
 
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
-if(WITH_PYTHON_INSTALL OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE))
-	set(PYTHON_NUMPY_PATH            "" CACHE PATH "Path to python site-packages or dist-packages containing 'numpy' module")
-	mark_as_advanced(PYTHON_NUMPY_PATH)
-	set(PYTHON_NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_PATH}/numpy/core/include CACHE PATH "Path to the include directory of the numpy module")
-	mark_as_advanced(PYTHON_NUMPY_INCLUDE_DIRS)
-endif()
 if(WITH_PYTHON_INSTALL)
 	option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder"  ON)
+	set(PYTHON_NUMPY_PATH            "" CACHE PATH "Path to python site-packages or dist-packages containing 'numpy' module")
+	mark_as_advanced(PYTHON_NUMPY_PATH)
 
 	if(UNIX AND NOT APPLE)
 		option(WITH_PYTHON_INSTALL_REQUESTS "Copy system requests into the blender install folder" ON)
@@ -478,16 +472,28 @@ endif()
 
 # OpenGL
 
+option(WITH_GLEW_MX             "Support multiple GLEW contexts (experimental)"                                                                     OFF )
 option(WITH_GLEW_ES             "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
 option(WITH_GL_EGL              "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)"       OFF)
+option(WITH_GL_PROFILE_COMPAT   "Support using the OpenGL 'compatibility' profile. (deprecated)"                                                    ON )
+option(WITH_GL_PROFILE_CORE     "Support using the OpenGL 3.2+ 'core' profile."                                                                     OFF)
 option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (thru either EGL or the AGL/WGL/XGL 'es20' profile)"                                  OFF)
 
 mark_as_advanced(
+	WITH_GLEW_MX
 	WITH_GLEW_ES
 	WITH_GL_EGL
+	WITH_GL_PROFILE_COMPAT
+	WITH_GL_PROFILE_CORE
 	WITH_GL_PROFILE_ES20
 )
 
+if(WITH_GL_PROFILE_COMPAT)
+	set(WITH_GLU ON)
+else()
+	set(WITH_GLU OFF)
+endif()
+
 if(WIN32)
 	option(WITH_GL_ANGLE "Link with the ANGLE library, an OpenGL ES 2.0 implementation based on Direct3D, instead of the system OpenGL library." OFF)
 	mark_as_advanced(WITH_GL_ANGLE)
@@ -513,10 +519,11 @@ if(APPLE)
 	set(WITH_CXX11 ON)
 elseif(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "6.0") AND (NOT WITH_CXX11))
 	set(_c11_init ON)
+	set(_cxx11_init ON)
 else()
 	set(_c11_init OFF)
+	set(_cxx11_init OFF)
 endif()
-set(_cxx11_init ON)
 
 option(WITH_C11 "Build with C11 standard enabled, for development use only!" ${_c11_init})
 mark_as_advanced(WITH_C11)
@@ -529,6 +536,10 @@ if(CMAKE_COMPILER_IS_GNUCC)
 	mark_as_advanced(WITH_LINKER_GOLD)
 endif()
 
+# Dependency graph
+option(WITH_LEGACY_DEPSGRAPH "Build Blender with legacy dependency graph" ON)
+mark_as_advanced(WITH_LEGACY_DEPSGRAPH)
+
 if(WIN32)
 	# Use hardcoded paths or find_package to find externals
 	option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF)
@@ -591,12 +602,6 @@ if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
 
-if(NOT WITH_CXX11)
-	if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE)
-		message(FATAL_ERROR "WITH_AUDASPACE requires WITH_CXX11")
-	endif()
-endif()
-
 if(NOT WITH_AUDASPACE)
 	if(WITH_OPENAL)
 		message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
@@ -645,10 +650,15 @@ if(NOT WITH_BOOST)
 	endmacro()
 
 	set_and_warn(WITH_CYCLES         OFF)
+	set_and_warn(WITH_AUDASPACE      OFF)
 	set_and_warn(WITH_INTERNATIONAL  OFF)
 	set_and_warn(WITH_OPENVDB        OFF)
 	set_and_warn(WITH_OPENCOLORIO    OFF)
-elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR
+
+	set_and_warn(WITH_OPENAL         OFF)  # depends on AUDASPACE
+	set_and_warn(WITH_GAMEENGINE     OFF)  # depends on AUDASPACE
+	set_and_warn(WITH_PLAYER         OFF)  # depends on GAMEENGINE
+elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_INTERNATIONAL OR
        WITH_OPENVDB OR WITH_OPENCOLORIO)
 	# Keep enabled
 else()
@@ -717,9 +727,30 @@ TEST_SHARED_PTR_SUPPORT()
 TEST_UNORDERED_MAP_SUPPORT()
 
 if(WITH_AUDASPACE)
-	if(NOT WITH_SYSTEM_AUDASPACE)
-		set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/audaspace/bindings/C" "${CMAKE_BINARY_DIR}/extern/audaspace")
-		set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/audaspace/bindings")
+	if(WITH_SYSTEM_AUDASPACE)
+		set(AUDASPACE_DEFINITIONS
+			-DWITH_AUDASPACE
+			-DWITH_SYSTEM_AUDASPACE
+			"-DAUD_DEVICE_H=<AUD_Device.h>"
+			"-DAUD_SPECIAL_H=<AUD_Special.h>"
+			"-DAUD_SOUND_H=<AUD_Sound.h>"
+			"-DAUD_HANDLE_H=<AUD_Handle.h>"
+			"-DAUD_SEQUENCE_H=<AUD_Sequence.h>"
+			"-DAUD_TYPES_H=<AUD_Types.h>"
+			"-DAUD_PYTHON_H=<python/PyAPI.h>"
+		)
+	else()
+		set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern")
+		set(AUDASPACE_PY_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/intern/audaspace/intern")
+		set(AUDASPACE_DEFINITIONS
+			-DWITH_AUDASPACE
+			"-DAUD_DEVICE_H=<AUD_C-API.h>"
+			"-DAUD_SPECIAL_H=<AUD_C-API.h>"
+			"-DAUD_SOUND_H=<AUD_C-API.h>"
+			"-DAUD_HANDLE_H=<AUD_C-API.h>"
+			"-DAUD_SEQUENCE_H=<AUD_C-API.h>"
+			"-DAUD_TYPES_H=<AUD_Space.h>"
+		)
 	endif()
 endif()
 
@@ -972,11 +1003,19 @@ endif()
 find_package(OpenGL)
 blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
 
+if(WITH_GLU)
+	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_glu_LIBRARY}")
+	list(APPEND GL_DEFINITIONS -DWITH_GLU)
+endif()
+
 if(WITH_SYSTEM_GLES)
 	find_package_wrapper(OpenGLES)
 endif()
 
-if(WITH_GL_PROFILE_ES20)
+if(WITH_GL_PROFILE_COMPAT OR WITH_GL_PROFILE_CORE)
+	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
+
+elseif(WITH_GL_PROFILE_ES20)
 	if(WITH_SYSTEM_GLES)
 		if(NOT OPENGLES_LIBRARY)
 			message(FATAL_ERROR
@@ -1036,9 +1075,6 @@ if(WITH_GL_PROFILE_ES20)
 
 	endif()
 
-else()
-	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_gl_LIBRARY}")
-
 endif()
 
 if(WITH_GL_EGL)
@@ -1086,10 +1122,16 @@ if(WITH_GL_EGL)
 
 endif()
 
+if(WITH_GL_PROFILE_COMPAT)
+	list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_COMPAT)
+endif()
+
+if(WITH_GL_PROFILE_CORE)
+	list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
+endif()
+
 if(WITH_GL_PROFILE_ES20)
 	list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_ES20)
-else()
-	list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_CORE)
 endif()
 
 if(WITH_GL_EGL)
@@ -1126,6 +1168,10 @@ endif()
 #-----------------------------------------------------------------------------
 # Configure GLEW
 
+if(WITH_GLEW_MX)
+	list(APPEND GL_DEFINITIONS -DWITH_GLEW_MX)
+endif()
+
 if(WITH_SYSTEM_GLEW)
 	find_package(GLEW)
 
@@ -1135,7 +1181,11 @@ if(WITH_SYSTEM_GLEW)
 		message(FATAL_ERROR "GLEW is required to build Blender. Install it or disable WITH_SYSTEM_GLEW.")
 	endif()
 
-	set(BLENDER_GLEW_LIBRARIES ${GLEW_LIBRARY})
+	if(WITH_GLEW_MX)
+		set(BLENDER_GLEW_LIBRARIES ${GLEW_MX_LIBRARY})
+	else()
+		set(BLENDER_GLEW_LIBRARIES ${GLEW_LIBRARY})
+	endif()
 else()
 	if(WITH_GLEW_ES)
 		set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew-es/include")
@@ -1143,11 +1193,12 @@ else()
 		list(APPEND GL_DEFINITIONS -DGLEW_STATIC -DWITH_GLEW_ES)
 
 		# These definitions remove APIs from glew.h, making GLEW smaller, and catching unguarded API usage
-		if(WITH_GL_PROFILE_ES20)
-			list(APPEND GL_DEFINITIONS -DGLEW_ES_ONLY)
-		else()
+		if(NOT WITH_GL_PROFILE_ES20)
 			# No ES functions are needed
 			list(APPEND GL_DEFINITIONS -DGLEW_NO_ES)
+		elseif(NOT (WITH_GL_PROFILE_CORE OR WITH_GL_PROFILE_COMPAT))
+			# ES is enabled, but the other functions are all disabled
+			list(APPEND GL_DEFINITIONS -DGLEW_ES_ONLY)
 		endif()
 
 		if(WITH_GL_PROFILE_ES20)
@@ -1184,7 +1235,9 @@ else()
 
 endif()
 
-list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
+if(NOT WITH_GLU)
+	list(APPEND GL_DEFINITIONS -DGLEW_NO_GLU)
+endif()
 
 #-----------------------------------------------------------------------------
 # Configure Bullet
@@ -1490,15 +1543,10 @@ if(WITH_PYTHON)
 		)
 	endif()
 
-	if(WIN32)
+	if(WIN32 OR APPLE)
 		# pass, we have this in an archive to extract
-	elseif((WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY) OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE))
-		if(("${PYTHON_NUMPY_PATH}" STREQUAL "") OR (${PYTHON_NUMPY_PATH} MATCHES NOTFOUND))
-			find_python_package(numpy)
-			unset(PYTHON_NUMPY_INCLUDE_DIRS CACHE)
-			set(PYTHON_NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_PATH}/numpy/core/include CACHE PATH "Path to the include directory of the numpy module")
-		        mark_as_advanced(PYTHON_NUMPY_INCLUDE_DIRS)
-		endif()
+	elseif(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY)
+		find_python_package(numpy)
 	endif()
 
 	if(WIN32 OR APPLE)
@@ -1735,7 +1783,10 @@ if(FIRST_RUN)
 
 	info_cfg_text("OpenGL:")
 	info_cfg_option(WITH_GLEW_ES)
+	info_cfg_option(WITH_GLU)
 	info_cfg_option(WITH_GL_EGL)
+	info_cfg_option(WITH_GL_PROFILE_COMPAT)
+	info_cfg_option(WITH_GL_PROFILE_CORE)
 	info_cfg_option(WITH_GL_PROFILE_ES20)
 	if(WIN32)
 		info_cfg_option(WITH_GL_ANGLE)

GNUmakefile

@@ -424,7 +424,7 @@ icons: .FORCE
 	"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
 
 update: .FORCE
-	if [ "$(OS_NCASE)" == "darwin" ] && [ ! -d "../lib/$(OS_NCASE)" ]; then \
+	if [ "$(OS_NCASE)" = "darwin" ] && [ ! -d "../lib/$(OS_NCASE)" ]; then \
 		svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/$(OS_NCASE) ../lib/$(OS_NCASE) ; \
 	fi
 	if [ -d "../lib" ]; then \

build_files/build_environment/cmake/openal.cmake

@@ -25,6 +25,7 @@ if(BUILD_MODE STREQUAL Release)
 		-DALSOFT_CONFIG=Off
 		-DALSOFT_HRTF_DEFS=Off
 		-DALSOFT_INSTALL=On
+		-DALSOFT_BACKEND_SNDIO=Off
 	)
 
 	if(UNIX)

build_files/build_environment/cmake/openimageio.cmake

@@ -90,6 +90,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
 	-DUSE_PYTHON=OFF
 	-DUSE_PYTHON3=OFF
 	-DUSE_OCIO=OFF
+	-DUSE_WEBP=${WITH_WEBP}
 	-DOIIO_BUILD_TOOLS=${OIIO_TOOLS}
 	-DOIIO_BUILD_TESTS=OFF
 	-DBUILD_TESTING=OFF

build_files/build_environment/install_deps.sh

@@ -25,7 +25,7 @@
 ARGS=$( \
 getopt \
 -o s:i:t:h \
---long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
+--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,use-cxx11,\
 with-all,with-opencollada,with-jack,\
 ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
 force-all,force-python,force-numpy,force-boost,\
@@ -104,6 +104,11 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --no-confirm
         Disable any interaction with user (suitable for automated run).
 
+    --use-cxx11
+        Build all libraries in cpp11 'mode' (will be mandatory soon in blender2.8 branch).
+        NOTE: If your compiler is gcc-6.0 or above, you probably *want* to enable this option (since it's default
+              standard starting from this version).
+
     --with-all
         By default, a number of optional and not-so-often needed libraries are not installed.
         This option will try to install them, at the cost of potential conflicts (depending on
@@ -285,7 +290,7 @@ SUDO="sudo"
 
 NO_BUILD=false
 NO_CONFIRM=false
-USE_CXX11=true  # Mandatory in blender2.8
+USE_CXX11=false
 
 PYTHON_VERSION="3.6.2"
 PYTHON_VERSION_MIN="3.6"
@@ -496,6 +501,9 @@ while true; do
     --no-confirm)
       NO_CONFIRM=true; shift; continue
     ;;
+    --use-cxx11)
+      USE_CXX11=true; shift; continue
+    ;;
     --with-all)
       WITH_ALL=true; shift; continue
     ;;
@@ -796,7 +804,7 @@ FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
 
 CXXFLAGS_BACK=$CXXFLAGS
 if [ "$USE_CXX11" = true ]; then
-  WARNING "C++11 is now mandatory for blender2.8, this *should* go smoothly with any very recent distribution.
+  WARNING "You are trying to use c++11, this *should* go smoothely with any very recent distribution
 However, if you are experiencing linking errors (also when building Blender itself), please try the following:
     * Re-run this script with '--build-all --force-all' options.
     * Ensure your gcc version is at the very least 4.8, if possible you should really rather use gcc-5.1 or above.
@@ -2677,10 +2685,10 @@ install_DEB() {
   install_packages_DEB $_packages
 
   PRINT""
-  LIBSNDFILE_DEV="libsndfile1-dev"
-  check_package_DEB $LIBSNDFILE_DEV
+  SNDFILE_DEV="libsndfile1-dev"
+  check_package_DEB $SNDFILE_DEV
   if [ $? -eq 0 ]; then
-    install_packages_DEB $LIBSNDFILE_DEV
+    install_packages_DEB $SNDFILE_DEV
   fi
 
   PRINT ""
@@ -3275,10 +3283,10 @@ install_RPM() {
   fi
 
   PRINT""
-  LIBSNDFILE_DEV="libsndfile-devel"
-  check_package_RPM $LIBSNDFILE_DEV
+  SNDFILE_DEV="libsndfile-devel"
+  check_package_RPM $SNDFILE_DEV
   if [ $? -eq 0 ]; then
-    install_packages_RPM $LIBSNDFILE_DEV
+    install_packages_RPM $SNDFILE_DEV
   fi
 
   if [ "$WITH_ALL" = true ]; then
@@ -3682,10 +3690,10 @@ install_ARCH() {
   install_packages_ARCH $_packages
 
   PRINT""
-  LIBSNDFILE_DEV="libsndfile"
-  check_package_ARCH $LIBSNDFILE_DEV
+  SNDFILE_DEV="libsndfile"
+  check_package_ARCH $SNDFILE_DEV
   if [ $? -eq 0 ]; then
-    install_packages_ARCH $LIBSNDFILE_DEV
+    install_packages_ARCH $SNDFILE_DEV
   fi
 
   PRINT ""

build_files/build_environment/patches/cmakelists_openvdb.txt

@@ -8,7 +8,7 @@ project(OpenVDB)
 
 # --------------------------------------------------------------------------------
 
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
 # --------------------------------------------------------------------------------
 

build_files/build_environment/patches/cmakelists_tbb.txt

@@ -88,6 +88,14 @@ elseif(WIN32)
   set(DISABLE_RTTI "/EHs- /GR- ")
 endif()
 
+if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+  include(CheckCXXCompilerFlag)
+  check_cxx_compiler_flag("-flifetime-dse=1" SUPPORTS_FLIFETIME)
+  if (SUPPORTS_FLIFETIME)
+    add_definitions(-flifetime-dse=1)
+  endif()
+endif()
+
 # Linker export definitions
 if (WIN32)
   add_custom_command(OUTPUT tbb.def

build_files/buildbot/config/blender_linux.cmake

@@ -74,7 +74,7 @@ set(SNDFILE_LIBRARY          "/usr/lib${MULTILIB}/libsndfile.a;/usr/lib${MULTILI
 
 # OpenAL libraries
 set(OPENAL_ROOT_DIR           "/opt/lib/openal" CACHE STRING "" FORCE)
-set(OPENAL_INCLUDE_DIR        "${OPENAL_ROOT_DIR}/include/AL" CACHE STRING "" FORCE)
+set(OPENAL_INCLUDE_DIR        "${OPENAL_ROOT_DIR}/include" CACHE STRING "" FORCE)
 set(OPENAL_LIBRARY
 	${OPENAL_ROOT_DIR}/lib/libopenal.a
 	${OPENAL_ROOT_DIR}/lib/libcommon.a
@@ -140,6 +140,10 @@ set(ZLIB_LIBRARY        "/usr/lib${MULTILIB}/libz.a"     CACHE STRING "" FORCE)
 # OpenVDB
 set(OPENVDB_LIBRARY
 	/opt/lib/openvdb/lib/libopenvdb.a
+	CACHE BOOL "" FORCE
+)
+
+set(BLOSC_LIBRARY
 	/opt/lib/blosc/lib/libblosc.a
 	CACHE BOOL "" FORCE
 )

build_files/cmake/Modules/FindBlosc.cmake

@@ -0,0 +1,72 @@
+# - Find Blosc library
+# Find the native Blosc includes and library
+# This module defines
+#  BLOSC_INCLUDE_DIRS, where to find blosc.h, Set when
+#                    Blosc is found.
+#  BLOSC_LIBRARIES, libraries to link against to use Blosc.
+#  BLOSC_ROOT_DIR, The base directory to search for Blosc.
+#                This can also be an environment variable.
+#  BLOSC_FOUND, If false, do not try to use Blosc.
+#
+# also defined, but not for general use are
+#  BLOSC_LIBRARY, where to find the Blosc library.
+
+#=============================================================================
+# Copyright 2018 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
+# If BLOSC_ROOT_DIR was defined in the environment, use it.
+IF(NOT BLOSC_ROOT_DIR AND NOT $ENV{BLOSC_ROOT_DIR} STREQUAL "")
+  SET(BLOSC_ROOT_DIR $ENV{BLOSC_ROOT_DIR})
+ENDIF()
+
+SET(_blosc_SEARCH_DIRS
+  ${BLOSC_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/lib/blosc
+)
+
+FIND_PATH(BLOSC_INCLUDE_DIR
+  NAMES
+    blosc.h
+  HINTS
+    ${_blosc_SEARCH_DIRS}
+  PATH_SUFFIXES
+    include
+)
+
+FIND_LIBRARY(BLOSC_LIBRARY
+  NAMES
+    blosc
+  HINTS
+    ${_blosc_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+  )
+
+# handle the QUIETLY and REQUIRED arguments and set BLOSC_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(BLOSC DEFAULT_MSG
+    BLOSC_LIBRARY BLOSC_INCLUDE_DIR)
+
+IF(BLOSC_FOUND)
+  SET(BLOSC_LIBRARIES ${BLOSC_LIBRARY})
+  SET(BLOSC_INCLUDE_DIRS ${BLOSC_INCLUDE_DIR})
+ELSE()
+  SET(BLOSC_BLOSC_FOUND FALSE)
+ENDIF()
+
+MARK_AS_ADVANCED(
+  BLOSC_INCLUDE_DIR
+  BLOSC_LIBRARY
+)

build_files/cmake/Modules/FindGLEW.cmake

@@ -9,6 +9,7 @@
 #
 # also defined,
 #  GLEW_LIBRARY, where to find the Glew library.
+#  GLEW_MX_LIBRARY, where to find the GlewMX library.
 
 #=============================================================================
 # Copyright 2014 Blender Foundation.
@@ -49,6 +50,16 @@ FIND_LIBRARY(GLEW_LIBRARY
     lib64 lib
   )
 
+
+FIND_LIBRARY(GLEW_MX_LIBRARY
+  NAMES
+    GLEWmx
+  HINTS
+    ${_glew_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+  )
+
 # handle the QUIETLY and REQUIRED arguments and set GLEW_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
@@ -62,6 +73,7 @@ ENDIF(GLEW_FOUND)
 MARK_AS_ADVANCED(
   GLEW_INCLUDE_DIR
   GLEW_LIBRARY
+  GLEW_MX_LIBRARY
 )
 
 UNSET(_glew_SEARCH_DIRS)

build_files/cmake/Modules/FindSndFile.cmake

@@ -1,15 +1,15 @@
 # - Find SndFile library
 # Find the native SndFile includes and library
 # This module defines
-#  LIBSNDFILE_INCLUDE_DIRS, where to find sndfile.h, Set when
-#                        LIBSNDFILE_INCLUDE_DIR is found.
-#  LIBSNDFILE_LIBRARIES, libraries to link against to use SndFile.
-#  LIBSNDFILE_ROOT_DIR, The base directory to search for SndFile.
+#  SNDFILE_INCLUDE_DIRS, where to find sndfile.h, Set when
+#                        SNDFILE_INCLUDE_DIR is found.
+#  SNDFILE_LIBRARIES, libraries to link against to use SndFile.
+#  SNDFILE_ROOT_DIR, The base directory to search for SndFile.
 #                    This can also be an environment variable.
-#  LIBSNDFILE_FOUND, If false, do not try to use SndFile.
+#  SNDFILE_FOUND, If false, do not try to use SndFile.
 #
 # also defined, but not for general use are
-#  LIBSNDFILE_LIBRARY, where to find the SndFile library.
+#  SNDFILE_LIBRARY, where to find the SndFile library.
 
 #=============================================================================
 # Copyright 2011 Blender Foundation.
@@ -22,26 +22,26 @@
 # See the License for more information.
 #=============================================================================
 
-# If LIBSNDFILE_ROOT_DIR was defined in the environment, use it.
-IF(NOT LIBSNDFILE_ROOT_DIR AND NOT $ENV{LIBSNDFILE_ROOT_DIR} STREQUAL "")
-	SET(LIBSNDFILE_ROOT_DIR $ENV{LIBSNDFILE_ROOT_DIR})
+# If SNDFILE_ROOT_DIR was defined in the environment, use it.
+IF(NOT SNDFILE_ROOT_DIR AND NOT $ENV{SNDFILE_ROOT_DIR} STREQUAL "")
+  SET(SNDFILE_ROOT_DIR $ENV{SNDFILE_ROOT_DIR})
 ENDIF()
 
 SET(_sndfile_SEARCH_DIRS
-	${LIBSNDFILE_ROOT_DIR}
+  ${SNDFILE_ROOT_DIR}
   /usr/local
   /sw # Fink
   /opt/local # DarwinPorts
 )
 
-FIND_PATH(LIBSNDFILE_INCLUDE_DIR sndfile.h
+FIND_PATH(SNDFILE_INCLUDE_DIR sndfile.h
   HINTS
     ${_sndfile_SEARCH_DIRS}
   PATH_SUFFIXES
     include
 )
 
-FIND_LIBRARY(LIBSNDFILE_LIBRARY
+FIND_LIBRARY(SNDFILE_LIBRARY
   NAMES
     sndfile
   HINTS
@@ -50,18 +50,18 @@ FIND_LIBRARY(LIBSNDFILE_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if 
+# handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG
-	LIBSNDFILE_LIBRARY LIBSNDFILE_INCLUDE_DIR)
+    SNDFILE_LIBRARY SNDFILE_INCLUDE_DIR)
 
-IF(LIBSNDFILE_FOUND)
-	SET(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY})
-	SET(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR})
-ENDIF(LIBSNDFILE_FOUND)
+IF(SNDFILE_FOUND)
+  SET(SNDFILE_LIBRARIES ${SNDFILE_LIBRARY})
+  SET(SNDFILE_INCLUDE_DIRS ${SNDFILE_INCLUDE_DIR})
+ENDIF(SNDFILE_FOUND)
 
 MARK_AS_ADVANCED(
-	LIBSNDFILE_INCLUDE_DIR
-	LIBSNDFILE_LIBRARY
+  SNDFILE_INCLUDE_DIR
+  SNDFILE_LIBRARY
 )

build_files/cmake/macros.cmake

@@ -326,7 +326,7 @@ function(SETUP_LIBDIRS)
 			link_directories(${JACK_LIBPATH})
 		endif()
 		if(WITH_CODEC_SNDFILE)
-			link_directories(${LIBSNDFILE_LIBPATH})
+			link_directories(${SNDFILE_LIBPATH})
 		endif()
 		if(WITH_FFTW3)
 			link_directories(${FFTW3_LIBPATH})
@@ -407,7 +407,7 @@ function(setup_liblinks
 		target_link_libraries(${target} ${JACK_LIBRARIES})
 	endif()
 	if(WITH_CODEC_SNDFILE)
-		target_link_libraries(${target} ${LIBSNDFILE_LIBRARIES})
+		target_link_libraries(${target} ${SNDFILE_LIBRARIES})
 	endif()
 	if(WITH_SDL AND NOT WITH_SDL_DYNLOAD)
 		target_link_libraries(${target} ${SDL_LIBRARY})
@@ -425,7 +425,7 @@ function(setup_liblinks
 			target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
 	endif()
 	if(WITH_OPENVDB)
-		target_link_libraries(${target} ${OPENVDB_LIBRARIES} ${TBB_LIBRARIES})
+		target_link_libraries(${target} ${OPENVDB_LIBRARIES} ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
 	endif()
 	if(WITH_CYCLES_OSL)
 		target_link_libraries(${target} ${OSL_LIBRARIES})
@@ -555,12 +555,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		endif()
 	endif()
 
-	if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE)
-		list(APPEND BLENDER_LINK_LIBS
-			audaspace
-			audaspace-py)
-	endif()
-
 	# Sort libraries
 	set(BLENDER_SORTED_LIBS
 		bf_windowmanager
@@ -593,7 +587,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_editor_curve
 		bf_editor_gpencil
 		bf_editor_interface
-		bf_editor_manipulator_library
 		bf_editor_mesh
 		bf_editor_metaball
 		bf_editor_object
@@ -601,7 +594,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_editor_armature
 		bf_editor_physics
 		bf_editor_render
-		bf_editor_scene
 		bf_editor_screen
 		bf_editor_sculpt_paint
 		bf_editor_sound
@@ -614,7 +606,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_python
 		bf_python_ext
 		bf_python_mathutils
-		bf_python_gawain
 		bf_python_bmesh
 		bf_freestyle
 		bf_ikplugin
@@ -622,14 +613,11 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_alembic
 		bf_bmesh
 		bf_gpu
-		bf_draw
 		bf_blenloader
 		bf_blenkernel
 		bf_physics
 		bf_nodes
 		bf_rna
-		bf_editor_manipulator_library  # rna -> manipulator bad-level calls
-		bf_python
 		bf_imbuf
 		bf_blenlib
 		bf_depsgraph
@@ -670,8 +658,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_blenfont
 		bf_blentranslation
 		bf_intern_audaspace
-		audaspace
-		audaspace-py
 		bf_intern_mikktspace
 		bf_intern_dualcon
 		bf_intern_cycles
@@ -683,7 +669,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		cycles_util
 		cycles_subd
 		bf_intern_opencolorio
-		bf_intern_gawain
 		bf_intern_eigen
 		extern_rangetree
 		extern_wcwidth
@@ -1525,7 +1510,6 @@ function(find_python_package
 		  NAMES
 		    ${package}
 		  HINTS
-		    "${PYTHON_LIBPATH}/"
 		    "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/"
 		    "${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/"
 		  PATH_SUFFIXES

build_files/cmake/platform/platform_apple.cmake

@@ -23,8 +23,6 @@
 
 # Libraries configuration for Apple.
 
-set(MACOSX_DEPLOYMENT_TARGET "10.9")
-
 macro(find_package_wrapper)
 # do nothing, just satisfy the macro
 endmacro()
@@ -45,7 +43,7 @@ if(WITH_OPENAL)
 	find_package(OpenAL)
 	if(OPENAL_FOUND)
 		set(WITH_OPENAL ON)
-		set(OPENAL_INCLUDE_DIR "${LIBDIR}/openal/include/AL")
+		set(OPENAL_INCLUDE_DIR "${LIBDIR}/openal/include")
 	else()
 		set(WITH_OPENAL OFF)
 	endif()
@@ -81,10 +79,10 @@ if(WITH_JACK)
 endif()
 
 if(WITH_CODEC_SNDFILE)
-	set(LIBSNDFILE ${LIBDIR}/sndfile)
-	set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
-	set(LIBSNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc)
-	set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib)  # TODO, deprecate
+	set(SNDFILE ${LIBDIR}/sndfile)
+	set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include)
+	set(SNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc)
+	set(SNDFILE_LIBPATH ${SNDFILE}/lib ${LIBDIR}/ffmpeg/lib)  # TODO, deprecate
 endif()
 
 if(WITH_PYTHON)

build_files/cmake/platform/platform_unix.cmake

@@ -148,7 +148,7 @@ endif()
 # Codecs
 if(WITH_CODEC_SNDFILE)
 	find_package_wrapper(SndFile)
-	if(NOT LIBSNDFILE_FOUND)
+	if(NOT SNDFILE_FOUND)
 		set(WITH_CODEC_SNDFILE OFF)
 	endif()
 endif()
@@ -237,10 +237,14 @@ endif()
 if(WITH_OPENVDB)
 	find_package_wrapper(OpenVDB)
 	find_package_wrapper(TBB)
+	find_package_wrapper(Blosc)
 	if(NOT OPENVDB_FOUND OR NOT TBB_FOUND)
 		set(WITH_OPENVDB OFF)
 		set(WITH_OPENVDB_BLOSC OFF)
 		message(STATUS "OpenVDB not found, disabling it")
+	elseif(NOT BLOSC_FOUND)
+		set(WITH_OPENVDB_BLOSC OFF)
+		message(STATUS "Blosc not found, disabling it")
 	endif()
 endif()
 

build_files/cmake/platform/platform_win32.cmake

@@ -532,21 +532,22 @@ set(WINTAB_INC ${LIBDIR}/wintab/include)
 if(WITH_OPENAL)
 	set(OPENAL ${LIBDIR}/openal)
 	set(OPENALDIR ${LIBDIR}/openal)
-	set(OPENAL_INCLUDE_DIR ${OPENAL}/include/AL)
+	set(OPENAL_INCLUDE_DIR ${OPENAL}/include)
 	set(OPENAL_LIBPATH ${OPENAL}/lib)
 	if(MSVC)
 		set(OPENAL_LIBRARY ${OPENAL_LIBPATH}/openal32.lib)
 	else()
 		set(OPENAL_LIBRARY ${OPENAL_LIBPATH}/wrap_oal.lib)
 	endif()
-
+	
 endif()
 
 if(WITH_CODEC_SNDFILE)
-	set(LIBSNDFILE ${LIBDIR}/sndfile)
-	set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
-	set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib) # TODO, deprecate
-	set(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBPATH}/libsndfile-1.lib)
+	set(SNDFILE ${LIBDIR}/sndfile)
+	set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include)
+	set(SNDFILE_LIBPATH ${SNDFILE}/lib) # TODO, deprecate
+	set(SNDFILE_LIBRARIES ${SNDFILE_LIBPATH}/libsndfile-1.lib)
+	
 endif()
 
 if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)

doc/doxygen/doxygen.source.h

@@ -224,10 +224,6 @@
  *  \ingroup editors
  */
 
-/** \defgroup edscene scene
- *  \ingroup editors
- */
-
 /** \defgroup edsculpt sculpt and paint
  *  \ingroup editors
  */

doc/python_api/examples/blf.py

@@ -2,43 +2,44 @@
 Hello World Text Example
 ++++++++++++++++++++++++
 
-Blender Game Engine example of using the blf module. For this module to work we
+Example of using the blf module. For this module to work we
 need to use the OpenGL wrapper :class:`~bgl` as well.
 """
-# import game engine modules
-from bge import render
-from bge import logic
 # import stand alone modules
 import bgl
 import blf
+import bpy
 
+font_info = {
+    "font_id": 0,
+    "handler": None,
+}
 
 def init():
     """init function - runs once"""
-    # create a new font object, use external ttf file
-    font_path = logic.expandPath('//Zeyada.ttf')
-    # store the font indice - to use later
-    logic.font_id = blf.load(font_path)
+    import os
+    # Create a new font object, use external ttf file.
+    font_path = bpy.path.abspath('//Zeyada.ttf')
+    # Store the font indice - to use later.
+    if os.path.exists(font_path):
+        font_info["font_id"] = blf.load(font_path)
+    else:
+        # Default font.
+        font_info["font_id"] = 0
 
     # set the font drawing routine to run every frame
-    scene = logic.getCurrentScene()
-    scene.post_draw = [write]
+    font_info["handler"] = bpy.types.SpaceView3D.draw_handler_add(
+        draw_callback_px, (None, None), 'WINDOW', 'POST_PIXEL')
 
 
-def write():
-    """write on screen"""
-    width = render.getWindowWidth()
-    height = render.getWindowHeight()
-
-    # OpenGL setup
-    bgl.glMatrixMode(bgl.GL_PROJECTION)
-    bgl.glLoadIdentity()
-    bgl.gluOrtho2D(0, width, 0, height)
-    bgl.glMatrixMode(bgl.GL_MODELVIEW)
-    bgl.glLoadIdentity()
-
+def draw_callback_px(self, context):
+    """Draw on the viewports"""
     # BLF drawing routine
-    font_id = logic.font_id
-    blf.position(font_id, (width * 0.2), (height * 0.3), 0)
+    font_id = font_info["font_id"]
+    blf.position(font_id, 2, 80, 0)
     blf.size(font_id, 50, 72)
     blf.draw(font_id, "Hello World")
+
+
+if __name__ == '__main__':
+    init()

doc/python_api/examples/gpu.offscreen.1.py

@@ -52,7 +52,6 @@ class OffScreenDraw(bpy.types.Operator):
     @staticmethod
     def _update_offscreen(context, offscreen):
         scene = context.scene
-        render_layer = context.render_layer
         render = scene.render
         camera = scene.camera
 
@@ -66,7 +65,6 @@ class OffScreenDraw(bpy.types.Operator):
 
         offscreen.draw_view3d(
                 scene,
-                render_layer,
                 context.space_data,
                 context.region,
                 projection_matrix,

doc/python_api/rst/bge.constraints.rst

@@ -2,12 +2,33 @@
 Physics Constraints (bge.constraints)
 =====================================
 
+Bullet Physics provides collision detection
+and rigid body dynamics for the Blender Game Engine.
+
+Features:
+
+- Vehicle simulation.
+- Rigid body constraints: hinge and point to point (ball socket).
+- Access to internal physics settings,
+  like deactivation time, and debugging features
+
 .. module:: bge.constraints
 
+.. note:: Note about parameter settings
+
+   Since this API is not well documented, it can be unclear what kind of values to use for setting parameters.
+   In general, damping settings should be in the range of 0 to 1 and
+   stiffness settings should not be much higher than about 10.
+
 
 Examples
 --------
 
+.. seealso::
+
+   For more examples of Bullet physics and how to use them
+   see the `pybullet forum <https://pybullet.org/Bullet/phpBB3/viewforum.php?f=17>`__.
+
 .. include:: __/examples/bge.constraints.py
    :start-line: 1
    :end-line: 4
@@ -333,4 +354,3 @@ Constraint type to be used with :func:`createConstraint`.
 .. data:: GENERIC_6DOF_CONSTRAINT
 
    .. to do
-

doc/python_api/rst/bge.types.rst

@@ -35,4 +35,3 @@ Types
    :glob:
 
    bge.types.*
-

doc/python_api/rst/bge_types/bge.types.BL_ActionActuator.rst

@@ -1,8 +1,6 @@
 BL_ActionActuator(SCA_IActuator)
 ================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: BL_ActionActuator(SCA_IActuator)
@@ -75,4 +73,3 @@ base class --- :class:`SCA_IActuator`
       The name of the property that is set to the current frame number.
 
       :type: string
-

doc/python_api/rst/bge_types/bge.types.BL_ArmatureActuator.rst

@@ -1,8 +1,6 @@
 BL_ArmatureActuator(SCA_IActuator)
 ==================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: BL_ArmatureActuator(SCA_IActuator)
@@ -58,4 +56,3 @@ base class --- :class:`SCA_IActuator`
       The influence this actuator will set on the constraint it controls.
 
       :type: float.
-

doc/python_api/rst/bge_types/bge.types.BL_ArmatureBone.rst

@@ -1,8 +1,6 @@
 BL_ArmatureBone(PyObjectPlus)
 =============================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: BL_ArmatureBone(PyObjectPlus)

doc/python_api/rst/bge_types/bge.types.BL_ArmatureChannel.rst

@@ -1,8 +1,6 @@
 BL_ArmatureChannel(PyObjectPlus)
 ================================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: BL_ArmatureChannel(PyObjectPlus)
@@ -275,4 +273,3 @@ base class --- :class:`PyObjectPlus`
       .. note::
       
          You can read the result of the calculation in rotation or euler_rotation attributes after setting this attribute.
-

doc/python_api/rst/bge_types/bge.types.BL_ArmatureConstraint.rst

@@ -1,8 +1,6 @@
 BL_ArmatureConstraint(PyObjectPlus)
 ===================================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: BL_ArmatureConstraint(PyObjectPlus)
@@ -126,4 +124,3 @@ base class --- :class:`PyObjectPlus`
       Additional mode for IK constraint. Currently only used for Distance constraint:
 
       :type: integer
-

doc/python_api/rst/bge_types/bge.types.BL_ArmatureObject.rst

@@ -1,8 +1,6 @@
 BL_ArmatureObject(KX_GameObject)
 ================================
 
-.. module:: bge.types
-
 base class --- :class:`KX_GameObject`
 
 .. class:: BL_ArmatureObject(KX_GameObject)
@@ -31,4 +29,3 @@ base class --- :class:`KX_GameObject`
       This action is unecessary if a KX_ArmatureActuator with mode run is active
       or if an action is playing. Use this function in other cases. It must be called
       on each frame to ensure that the armature is updated continously.
-

doc/python_api/rst/bge_types/bge.types.BL_Shader.rst

@@ -1,8 +1,6 @@
 BL_Shader(PyObjectPlus)
 =======================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: BL_Shader(PyObjectPlus)
@@ -227,4 +225,3 @@ base class --- :class:`PyObjectPlus`
    .. method:: validate()
 
       Validate the shader object.
-

doc/python_api/rst/bge_types/bge.types.BL_ShapeActionActuator.rst

@@ -1,8 +1,6 @@
 BL_ShapeActionActuator(SCA_IActuator)
 =====================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: BL_ShapeActionActuator(SCA_IActuator)

doc/python_api/rst/bge_types/bge.types.CListValue.rst

@@ -1,8 +1,6 @@
 CListValue(CPropValue)
 ======================
 
-.. module:: bge.types
-
 base class --- :class:`CPropValue`
 
 .. class:: CListValue(CPropValue)
@@ -69,4 +67,3 @@ base class --- :class:`CPropValue`
       .. warning::
 
          The id can't be stored as an integer in game object properties, as those only have a limited range that the id may not be contained in. Instead an id can be stored as a string game property and converted back to an integer for use in from_id lookups.
-

doc/python_api/rst/bge_types/bge.types.CPropValue.rst

@@ -1,11 +1,8 @@
 CPropValue(CValue)
 ==================
 
-.. module:: bge.types
-
 base class --- :class:`CValue`
 
 .. class:: CPropValue(CValue)
 
    This class has no python functions
-

doc/python_api/rst/bge_types/bge.types.CValue.rst

@@ -1,8 +1,6 @@
 CValue(PyObjectPlus)
 ====================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: CValue(PyObjectPlus)

doc/python_api/rst/bge_types/bge.types.KX_ArmatureSensor.rst

@@ -1,8 +1,6 @@
 KX_ArmatureSensor(SCA_ISensor)
 ==============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: KX_ArmatureSensor(SCA_ISensor)

doc/python_api/rst/bge_types/bge.types.KX_BlenderMaterial.rst

@@ -1,8 +1,6 @@
 KX_BlenderMaterial(PyObjectPlus)
 ================================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_BlenderMaterial(PyObjectPlus)
@@ -182,4 +180,3 @@ base class --- :class:`PyObjectPlus`
 
       :return: the material's index
       :rtype: integer
-

doc/python_api/rst/bge_types/bge.types.KX_Camera.rst

@@ -1,8 +1,6 @@
 KX_Camera(KX_GameObject)
 ========================
 
-.. module:: bge.types
-
 base class --- :class:`KX_GameObject`
 
 .. class:: KX_Camera(KX_GameObject)

doc/python_api/rst/bge_types/bge.types.KX_CameraActuator.rst

@@ -1,8 +1,6 @@
 KX_CameraActuator(SCA_IActuator)
 ================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_CameraActuator(SCA_IActuator)
@@ -44,4 +42,3 @@ base class --- :class:`SCA_IActuator`
       the object this actuator tracks.
 
       :type: :class:`KX_GameObject` or None
-

doc/python_api/rst/bge_types/bge.types.KX_CharacterWrapper.rst

@@ -1,8 +1,6 @@
 KX_CharacterWrapper(PyObjectPlus)
 =================================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_CharacterWrapper(PyObjectPlus)
@@ -42,4 +40,3 @@ base class --- :class:`PyObjectPlus`
    .. method:: jump()
 
       The character jumps based on it's jump speed.
-

doc/python_api/rst/bge_types/bge.types.KX_ConstraintActuator.rst

@@ -1,8 +1,6 @@
 KX_ConstraintActuator(SCA_IActuator)
 ====================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_ConstraintActuator(SCA_IActuator)

doc/python_api/rst/bge_types/bge.types.KX_ConstraintWrapper.rst

@@ -1,8 +1,6 @@
 KX_ConstraintWrapper(PyObjectPlus)
 ==================================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_ConstraintWrapper(PyObjectPlus)
@@ -140,4 +138,3 @@ base class --- :class:`PyObjectPlus`
          - :class:`~bge.constraints.CONETWIST_CONSTRAINT`
          - :class:`~bge.constraints.VEHICLE_CONSTRAINT`
          - :class:`~bge.constraints.GENERIC_6DOF_CONSTRAINT`
-

doc/python_api/rst/bge_types/bge.types.KX_FontObject.rst

@@ -1,8 +1,6 @@
 KX_FontObject(KX_GameObject)
 ============================
 
-.. module:: bge.types
-
 base class --- :class:`KX_GameObject`
 
 .. class:: KX_FontObject(KX_GameObject)
@@ -29,4 +27,3 @@ base class --- :class:`KX_GameObject`
       The text displayed by this Font object.
 
       :type: string
-

doc/python_api/rst/bge_types/bge.types.KX_GameActuator.rst

@@ -1,8 +1,6 @@
 KX_GameActuator(SCA_IActuator)
 ==============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_GameActuator(SCA_IActuator)
@@ -20,4 +18,3 @@ base class --- :class:`SCA_IActuator`
       The mode of this actuator. Can be on of :ref:`these constants <game-actuator>`
 
       :type: Int
-

doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst

@@ -1,8 +1,6 @@
 KX_GameObject(SCA_IObject)
 ==========================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IObject`
 
 .. class:: KX_GameObject(SCA_IObject)

doc/python_api/rst/bge_types/bge.types.KX_LibLoadStatus.rst

@@ -1,8 +1,6 @@
 KX_LibLoadStatus(PyObjectPlus)
 ==============================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_LibLoadStatus(PyObjectPlus)
@@ -48,4 +46,3 @@ base class --- :class:`PyObjectPlus`
       The amount of time, in seconds, the lib load took (0 until the operation is complete).
 
       :type: float
-

doc/python_api/rst/bge_types/bge.types.KX_LightObject.rst

@@ -1,8 +1,6 @@
 KX_LightObject(KX_GameObject)
 =============================
 
-.. module:: bge.types
-
 base class --- :class:`KX_GameObject`
 
 .. class:: KX_LightObject(KX_GameObject)
@@ -161,4 +159,3 @@ base class --- :class:`KX_GameObject`
       .. note::
          
          Higher values result in a more focused light source.
-

doc/python_api/rst/bge_types/bge.types.KX_MeshProxy.rst

@@ -1,8 +1,6 @@
 KX_MeshProxy(SCA_IObject)
 =========================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IObject`
 
 .. class:: KX_MeshProxy(SCA_IObject)
@@ -131,4 +129,3 @@ base class --- :class:`SCA_IObject`
       :type uv_index: integer
       :arg uv_index_from: optional uv index to copy from, -1 to transform the current uv.
       :type uv_index_from: integer
-

doc/python_api/rst/bge_types/bge.types.KX_MouseActuator.rst

@@ -1,8 +1,6 @@
 KX_MouseActuator(SCA_IActuator)
 ====================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_MouseActuator(SCA_IActuator)
@@ -100,4 +98,3 @@ base class --- :class:`SCA_IActuator`
       The current rotational offset caused by the mouse actuator in degrees.
 
       :type: list (vector of 2 floats)
-

doc/python_api/rst/bge_types/bge.types.KX_MouseFocusSensor.rst

@@ -1,8 +1,6 @@
 KX_MouseFocusSensor(SCA_MouseSensor)
 ====================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_MouseSensor`
 
 .. class:: KX_MouseFocusSensor(SCA_MouseSensor)

doc/python_api/rst/bge_types/bge.types.KX_NavMeshObject.rst

@@ -1,8 +1,6 @@
 KX_NavMeshObject(KX_GameObject)
 ===============================
 
-.. module:: bge.types
-
 base class --- :class:`KX_GameObject`
 
 .. class:: KX_NavMeshObject(KX_GameObject)
@@ -44,4 +42,3 @@ base class --- :class:`KX_GameObject`
       Rebuild the navigation mesh.
 
       :return: None
-

doc/python_api/rst/bge_types/bge.types.KX_NearSensor.rst

@@ -1,8 +1,6 @@
 KX_NearSensor(KX_TouchSensor)
 =============================
 
-.. module:: bge.types
-
 base class --- :class:`KX_TouchSensor`
 
 .. class:: KX_NearSensor(KX_TouchSensor)
@@ -20,4 +18,3 @@ base class --- :class:`KX_TouchSensor`
       The near sensor deactivates when the object exceeds this distance.
 
       :type: float
-

doc/python_api/rst/bge_types/bge.types.KX_NetworkMessageActuator.rst

@@ -1,8 +1,6 @@
 KX_NetworkMessageActuator(SCA_IActuator)
 ========================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_NetworkMessageActuator(SCA_IActuator)
@@ -32,4 +30,3 @@ base class --- :class:`SCA_IActuator`
       Send a property instead of a regular body message.
 
       :type: boolean
-

doc/python_api/rst/bge_types/bge.types.KX_NetworkMessageSensor.rst

@@ -1,8 +1,6 @@
 KX_NetworkMessageSensor(SCA_ISensor)
 ====================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: KX_NetworkMessageSensor(SCA_ISensor)
@@ -34,5 +32,3 @@ base class --- :class:`SCA_ISensor`
       The list of message bodies received. (read-only).
 
       :type: list of strings
-
-

doc/python_api/rst/bge_types/bge.types.KX_ObjectActuator.rst

@@ -1,8 +1,6 @@
 KX_ObjectActuator(SCA_IActuator)
 ================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_ObjectActuator(SCA_IActuator)
@@ -126,4 +124,3 @@ base class --- :class:`SCA_IActuator`
       The object that is used as reference to compute the velocity for the servo controller.
 
       :type: :class:`KX_GameObject` or None
-

doc/python_api/rst/bge_types/bge.types.KX_ParentActuator.rst

@@ -1,8 +1,6 @@
 KX_ParentActuator(SCA_IActuator)
 ================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_ParentActuator(SCA_IActuator)
@@ -35,4 +33,3 @@ base class --- :class:`SCA_IActuator`
       Effective only if the shape is not added to the parent compound shape.
 
       :type: boolean
-

doc/python_api/rst/bge_types/bge.types.KX_PolyProxy.rst

@@ -1,8 +1,6 @@
 KX_PolyProxy(SCA_IObject)
 =========================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IObject`
 
 .. class:: KX_PolyProxy(SCA_IObject)
@@ -136,4 +134,3 @@ base class --- :class:`SCA_IObject`
 
       :return: mesh proxy
       :rtype: :class:`MeshProxy`
-

doc/python_api/rst/bge_types/bge.types.KX_RadarSensor.rst

@@ -1,8 +1,6 @@
 KX_RadarSensor(KX_NearSensor)
 =============================
 
-.. module:: bge.types
-
 base class --- :class:`KX_NearSensor`
 
 .. class:: KX_RadarSensor(KX_NearSensor)
@@ -41,4 +39,3 @@ base class --- :class:`KX_NearSensor`
 
       KX_RADAR_AXIS_POS_X, KX_RADAR_AXIS_POS_Y, KX_RADAR_AXIS_POS_Z, 
       KX_RADAR_AXIS_NEG_X, KX_RADAR_AXIS_NEG_Y, KX_RADAR_AXIS_NEG_Z
-

doc/python_api/rst/bge_types/bge.types.KX_RaySensor.rst

@@ -1,8 +1,6 @@
 KX_RaySensor(SCA_ISensor)
 =========================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: KX_RaySensor(SCA_ISensor)
@@ -75,4 +73,3 @@ base class --- :class:`SCA_ISensor`
       * KX_RAY_AXIS_NEG_X
       * KX_RAY_AXIS_NEG_Y
       * KX_RAY_AXIS_NEG_Z
-

doc/python_api/rst/bge_types/bge.types.KX_SCA_AddObjectActuator.rst

@@ -1,8 +1,6 @@
 KX_SCA_AddObjectActuator(SCA_IActuator)
 =======================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SCA_AddObjectActuator(SCA_IActuator)
@@ -52,4 +50,3 @@ base class --- :class:`SCA_IActuator`
       adds the object without needing to calling SCA_PythonController.activate()
 
       .. note:: Use objectLastCreated to get the newly created object.
-

doc/python_api/rst/bge_types/bge.types.KX_SCA_DynamicActuator.rst

@@ -1,8 +1,6 @@
 KX_SCA_DynamicActuator(SCA_IActuator)
 =====================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SCA_DynamicActuator(SCA_IActuator)
@@ -26,4 +24,3 @@ base class --- :class:`SCA_IActuator`
       the mass value for the KX_DYN_SET_MASS operation.
 
       :type: float
-

doc/python_api/rst/bge_types/bge.types.KX_SCA_EndObjectActuator.rst

@@ -1,8 +1,6 @@
 KX_SCA_EndObjectActuator(SCA_IActuator)
 =======================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SCA_EndObjectActuator(SCA_IActuator)
@@ -10,4 +8,3 @@ base class --- :class:`SCA_IActuator`
    Edit Object Actuator (in End Object mode)
 
    This actuator has no python methods.
-

doc/python_api/rst/bge_types/bge.types.KX_SCA_ReplaceMeshActuator.rst

@@ -1,8 +1,6 @@
 KX_SCA_ReplaceMeshActuator(SCA_IActuator)
 =========================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SCA_ReplaceMeshActuator(SCA_IActuator)
@@ -86,4 +84,3 @@ base class --- :class:`SCA_IActuator`
    .. method:: instantReplaceMesh()
 
       Immediately replace mesh without delay.
-

doc/python_api/rst/bge_types/bge.types.KX_Scene.rst

@@ -1,8 +1,6 @@
 KX_Scene(PyObjectPlus)
 ======================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_Scene(PyObjectPlus)
@@ -183,4 +181,3 @@ base class --- :class:`PyObjectPlus`
    .. method:: drawObstacleSimulation()
 
       Draw debug visualization of obstacle simulation.
-

doc/python_api/rst/bge_types/bge.types.KX_SceneActuator.rst

@@ -1,8 +1,6 @@
 KX_SceneActuator(SCA_IActuator)
 ===============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SceneActuator(SCA_IActuator)
@@ -46,4 +44,3 @@ base class --- :class:`SCA_IActuator`
       The mode of the actuator.
 
       :type: integer from 0 to 5.
-

doc/python_api/rst/bge_types/bge.types.KX_SoundActuator.rst

@@ -1,8 +1,6 @@
 KX_SoundActuator(SCA_IActuator)
 ===============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SoundActuator(SCA_IActuator)
@@ -112,4 +110,3 @@ base class --- :class:`SCA_IActuator`
       Stops the sound.
 
       :return: None
-

doc/python_api/rst/bge_types/bge.types.KX_StateActuator.rst

@@ -1,8 +1,6 @@
 KX_StateActuator(SCA_IActuator)
 ===============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_StateActuator(SCA_IActuator)
@@ -26,4 +24,3 @@ base class --- :class:`SCA_IActuator`
       The bits that are 0 are will be left unmodified expect for the Copy operation which copies the mask to the object state.
 
       :type: integer
-

doc/python_api/rst/bge_types/bge.types.KX_SteeringActuator.rst

@@ -1,8 +1,6 @@
 KX_SteeringActuator(SCA_IActuator)
 ==================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SteeringActuator(SCA_IActuator)
@@ -68,4 +66,3 @@ base class --- :class:`SCA_IActuator`
       Path update period
 
       :type: int
-

doc/python_api/rst/bge_types/bge.types.KX_TouchSensor.rst

@@ -1,8 +1,6 @@
 KX_TouchSensor(SCA_ISensor)
 ===========================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: KX_TouchSensor(SCA_ISensor)
@@ -44,4 +42,3 @@ base class --- :class:`SCA_ISensor`
       The material of the object in the face hit by the ray. (read-only).
 
       :type: string
-

doc/python_api/rst/bge_types/bge.types.KX_TrackToActuator.rst

@@ -1,8 +1,6 @@
 KX_TrackToActuator(SCA_IActuator)
 =================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_TrackToActuator(SCA_IActuator)

doc/python_api/rst/bge_types/bge.types.KX_VehicleWrapper.rst

@@ -1,8 +1,6 @@
 KX_VehicleWrapper(PyObjectPlus)
 ===============================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_VehicleWrapper(PyObjectPlus)
@@ -163,4 +161,3 @@ base class --- :class:`PyObjectPlus`
 
       :arg wheelIndex: the wheel index
       :type wheelIndex: integer
-

doc/python_api/rst/bge_types/bge.types.KX_VertexProxy.rst

@@ -1,8 +1,6 @@
 KX_VertexProxy(SCA_IObject)
 ===========================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IObject`
 
 .. class:: KX_VertexProxy(SCA_IObject)
@@ -206,4 +204,3 @@ base class --- :class:`SCA_IObject`
       :type:  sequence of floats [r, g, b]
 
       :arg normal: the new normal of this vertex.
-

doc/python_api/rst/bge_types/bge.types.KX_VisibilityActuator.rst

@@ -1,8 +1,6 @@
 KX_VisibilityActuator(SCA_IActuator)
 ====================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_VisibilityActuator(SCA_IActuator)
@@ -26,4 +24,3 @@ base class --- :class:`SCA_IActuator`
       whether the visibility/occlusion should be propagated to all children of the object.
 
       :type: boolean
-

doc/python_api/rst/bge_types/bge.types.KX_WorldInfo.rst

@@ -1,8 +1,6 @@
 KX_WorldInfo(PyObjectPlus)
 =============================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_WorldInfo(PyObjectPlus)

doc/python_api/rst/bge_types/bge.types.PyObjectPlus.rst

@@ -1,8 +1,6 @@
 PyObjectPlus
 ============
 
-.. module:: bge.types
-
 .. class:: PyObjectPlus
 
    PyObjectPlus base class of most other types in the Game Engine.
@@ -18,4 +16,3 @@ PyObjectPlus
       The invalid attribute allows testing for this case without exception handling.
 
       :type: boolean
-

doc/python_api/rst/bge_types/bge.types.SCA_2DFilterActuator.rst

@@ -1,8 +1,6 @@
 SCA_2DFilterActuator(SCA_IActuator)
 ===================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: SCA_2DFilterActuator(SCA_IActuator)
@@ -46,4 +44,3 @@ base class --- :class:`SCA_IActuator`
       argument for motion blur filter.
 
       :type: float (0.0-100.0)
-

doc/python_api/rst/bge_types/bge.types.SCA_ANDController.rst

@@ -1,8 +1,6 @@
 SCA_ANDController(SCA_IController)
 ==================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IController`
 
 .. class:: SCA_ANDController(SCA_IController)
@@ -10,4 +8,3 @@ base class --- :class:`SCA_IController`
    An AND controller activates only when all linked sensors are activated.
 
    There are no special python methods for this controller.
-

doc/python_api/rst/bge_types/bge.types.SCA_ActuatorSensor.rst

@@ -1,8 +1,6 @@
 SCA_ActuatorSensor(SCA_ISensor)
 ===============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: SCA_ActuatorSensor(SCA_ISensor)
@@ -16,4 +14,3 @@ base class --- :class:`SCA_ISensor`
       the name of the actuator that the sensor is monitoring.
 
       :type: string
-

doc/python_api/rst/bge_types/bge.types.SCA_AlwaysSensor.rst

@@ -1,11 +1,8 @@
 SCA_AlwaysSensor(SCA_ISensor)
 =============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: SCA_AlwaysSensor(SCA_ISensor)
 
    This sensor is always activated.
-

doc/python_api/rst/bge_types/bge.types.SCA_DelaySensor.rst

@@ -1,8 +1,6 @@
 SCA_DelaySensor(SCA_ISensor)
 ============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: SCA_DelaySensor(SCA_ISensor)
@@ -36,4 +34,3 @@ base class --- :class:`SCA_ISensor`
       1 if the OFF-ON cycle should be repeated indefinately, 0 if it should run once.
 
       :type: integer
-

doc/python_api/rst/bge_types/bge.types.SCA_IActuator.rst

@@ -1,11 +1,8 @@
 SCA_IActuator(SCA_ILogicBrick)
 ==============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ILogicBrick`
 
 .. class:: SCA_IActuator(SCA_ILogicBrick)
 
    Base class for all actuator logic bricks.
-

doc/python_api/rst/bge_types/bge.types.SCA_IController.rst

@@ -1,8 +1,6 @@
 SCA_IController(SCA_ILogicBrick)
 ================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ILogicBrick`
 
 .. class:: SCA_IController(SCA_ILogicBrick)
@@ -52,4 +50,3 @@ base class --- :class:`SCA_ILogicBrick`
       .. note::
          
          Order of execution between high priority controllers is not guaranteed.
-

doc/python_api/rst/bge_types/bge.types.SCA_ILogicBrick.rst

@@ -1,8 +1,6 @@
 SCA_ILogicBrick(CValue)
 =======================
 
-.. module:: bge.types
-
 base class --- :class:`CValue`
 
 .. class:: SCA_ILogicBrick(CValue)
@@ -26,4 +24,3 @@ base class --- :class:`CValue`
       The name of this logic brick (read-only).
       
       :type: string
-

doc/python_api/rst/bge_types/bge.types.SCA_IObject.rst

@@ -1,11 +1,8 @@
 SCA_IObject(CValue)
 ===================
 
-.. module:: bge.types
-
 base class --- :class:`CValue`
 
 .. class:: SCA_IObject(CValue)
 
    This class has no python functions
-

doc/python_api/rst/bge_types/bge.types.SCA_ISensor.rst

@@ -1,8 +1,6 @@
 SCA_ISensor(SCA_ILogicBrick)
 ============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ILogicBrick`
 
 .. class:: SCA_ISensor(SCA_ILogicBrick)
@@ -98,4 +96,3 @@ base class --- :class:`SCA_ILogicBrick`
       Reset sensor internal state, effect depends on the type of sensor and settings.
 
       The sensor is put in its initial state as if it was just activated.
-

doc/python_api/rst/bge_types/bge.types.SCA_JoystickSensor.rst

@@ -1,8 +1,6 @@
 SCA_JoystickSensor(SCA_ISensor)
 ===============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: SCA_JoystickSensor(SCA_ISensor)
@@ -130,4 +128,3 @@ base class --- :class:`SCA_ISensor`
       :type buttonIndex: integer
       :return: The current pressed state of the specified button.
       :rtype: boolean
-

doc/python_api/rst/bge_types/bge.types.SCA_KeyboardSensor.rst

@@ -1,8 +1,6 @@
 SCA_KeyboardSensor(SCA_ISensor)
 ===============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: SCA_KeyboardSensor(SCA_ISensor)
@@ -61,4 +59,3 @@ base class --- :class:`SCA_ISensor`
       :type keycode: integer
       :return: The state of the given key, can be one of :ref:`these constants<input-status>`
       :rtype: int
-

doc/python_api/rst/bge_types/bge.types.SCA_MouseSensor.rst

@@ -1,8 +1,6 @@
 SCA_MouseSensor(SCA_ISensor)
 ============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: SCA_MouseSensor(SCA_ISensor)
@@ -36,4 +34,3 @@ base class --- :class:`SCA_ISensor`
       :type button: int
       :return: The state of the given key, can be one of :ref:`these constants<input-status>`
       :rtype: int
-

doc/python_api/rst/bge_types/bge.types.SCA_NANDController.rst

@@ -1,8 +1,6 @@
 SCA_NANDController(SCA_IController)
 ===================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IController`
 
 .. class:: SCA_NANDController(SCA_IController)
@@ -10,4 +8,3 @@ base class --- :class:`SCA_IController`
    An NAND controller activates when all linked sensors are not active.
 
    There are no special python methods for this controller.
-

doc/python_api/rst/bge_types/bge.types.SCA_NORController.rst

@@ -1,8 +1,6 @@
 SCA_NORController(SCA_IController)
 ==================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IController`
 
 .. class:: SCA_NORController(SCA_IController)
@@ -10,4 +8,3 @@ base class --- :class:`SCA_IController`
    An NOR controller activates only when all linked sensors are de-activated.
 
    There are no special python methods for this controller.
-

doc/python_api/rst/bge_types/bge.types.SCA_ORController.rst

@@ -1,8 +1,6 @@
 SCA_ORController(SCA_IController)
 =================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IController`
 
 .. class:: SCA_ORController(SCA_IController)
@@ -10,4 +8,3 @@ base class --- :class:`SCA_IController`
    An OR controller activates when any connected sensor activates.
 
    There are no special python methods for this controller.
-

doc/python_api/rst/bge_types/bge.types.SCA_PropertyActuator.rst

@@ -1,8 +1,6 @@
 SCA_PropertyActuator(SCA_IActuator)
 ===================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: SCA_PropertyActuator(SCA_IActuator)
@@ -26,4 +24,3 @@ base class --- :class:`SCA_IActuator`
       TODO - add constants to game logic dict!.
 
       :type: integer
-

doc/python_api/rst/bge_types/bge.types.SCA_PropertySensor.rst

@@ -1,8 +1,6 @@
 SCA_PropertySensor(SCA_ISensor)
 ===============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: SCA_PropertySensor(SCA_ISensor)
@@ -38,4 +36,3 @@ base class --- :class:`SCA_ISensor`
       the maximum value of the range used to evaluate the property when in interval mode.
 
       :type: string
-

doc/python_api/rst/bge_types/bge.types.SCA_PythonController.rst

@@ -1,8 +1,6 @@
 SCA_PythonController(SCA_IController)
 =====================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IController`
 
 .. class:: SCA_PythonController(SCA_IController)
@@ -51,4 +49,3 @@ base class --- :class:`SCA_IController`
 
       :arg actuator: The actuator to operate on.
       :type actuator: actuator or the actuator name as a string
-

doc/python_api/rst/bge_types/bge.types.SCA_PythonJoystick.rst

@@ -1,8 +1,6 @@
 SCA_PythonJoystick(PyObjectPlus)
 ================================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: SCA_PythonJoystick(PyObjectPlus)
@@ -74,4 +72,3 @@ base class --- :class:`PyObjectPlus`
       The number of hats for the joystick at this index. (read-only).
 
       :type: integer
-

doc/python_api/rst/bge_types/bge.types.SCA_PythonKeyboard.rst

@@ -1,8 +1,6 @@
 SCA_PythonKeyboard(PyObjectPlus)
 ================================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: SCA_PythonKeyboard(PyObjectPlus)
@@ -34,4 +32,3 @@ base class --- :class:`PyObjectPlus`
 
       :arg text: New clipboard text
       :type text: string
-

doc/python_api/rst/bge_types/bge.types.SCA_PythonMouse.rst

@@ -1,8 +1,6 @@
 SCA_PythonMouse(PyObjectPlus)
 =============================
 
-.. module:: bge.types
-
 base class --- :class:`PyObjectPlus`
 
 .. class:: SCA_PythonMouse(PyObjectPlus)
@@ -32,4 +30,3 @@ base class --- :class:`PyObjectPlus`
       The visibility of the mouse cursor.
       
       :type: boolean
-

doc/python_api/rst/bge_types/bge.types.SCA_RandomActuator.rst

@@ -1,8 +1,6 @@
 SCA_RandomActuator(SCA_IActuator)
 =================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IActuator`
 
 .. class:: SCA_RandomActuator(SCA_IActuator)
@@ -124,4 +122,3 @@ base class --- :class:`SCA_IActuator`
       The half-life 'time' is characterized by half_life.
       
       :type half_life: float
-

doc/python_api/rst/bge_types/bge.types.SCA_RandomSensor.rst

@@ -1,8 +1,6 @@
 SCA_RandomSensor(SCA_ISensor)
 =============================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_ISensor`
 
 .. class:: SCA_RandomSensor(SCA_ISensor)
@@ -20,4 +18,3 @@ base class --- :class:`SCA_ISensor`
       The seed of the random number generator.
 
       :type: integer
-

doc/python_api/rst/bge_types/bge.types.SCA_XNORController.rst

@@ -1,8 +1,6 @@
 SCA_XNORController(SCA_IController)
 ===================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IController`
 
 .. class:: SCA_XNORController(SCA_IController)
@@ -10,4 +8,3 @@ base class --- :class:`SCA_IController`
    An XNOR controller activates when all linked sensors are the same (activated or inative).
 
    There are no special python methods for this controller.
-

doc/python_api/rst/bge_types/bge.types.SCA_XORController.rst

@@ -1,8 +1,6 @@
 SCA_XORController(SCA_IController)
 ==================================
 
-.. module:: bge.types
-
 base class --- :class:`SCA_IController`
 
 .. class:: SCA_XORController(SCA_IController)
@@ -10,4 +8,3 @@ base class --- :class:`SCA_IController`
    An XOR controller activates when there is the input is mixed, but not when all are on or off.
 
    There are no special python methods for this controller.
-

doc/python_api/sphinx_doc_gen.py

@@ -332,9 +332,6 @@ except ImportError:
 # to avoid having to match Blender's source tree.
 EXTRA_SOURCE_FILES = (
     "../../../release/scripts/templates_py/bmesh_simple.py",
-    "../../../release/scripts/templates_py/manipulator_operator.py",
-    "../../../release/scripts/templates_py/manipulator_operator_target.py",
-    "../../../release/scripts/templates_py/manipulator_simple.py",
     "../../../release/scripts/templates_py/operator_simple.py",
     "../../../release/scripts/templates_py/ui_panel_simple.py",
     "../../../release/scripts/templates_py/ui_previews_custom_icon.py",
@@ -1036,7 +1033,6 @@ context_type_map = {
     "brush": ("Brush", False),
     "camera": ("Camera", False),
     "cloth": ("ClothModifier", False),
-    "collection": ("LayerCollection", False),
     "collision": ("CollisionModifier", False),
     "curve": ("Curve", False),
     "dynamic_paint": ("DynamicPaintModifier", False),
@@ -1057,7 +1053,6 @@ context_type_map = {
     "image_paint_object": ("Object", False),
     "lamp": ("Lamp", False),
     "lattice": ("Lattice", False),
-    "lightprobe": ("LightProbe", False),
     "line_style": ("FreestyleLineStyle", False),
     "material": ("Material", False),
     "material_slot": ("MaterialSlot", False),
@@ -1069,7 +1064,6 @@ context_type_map = {
     "particle_system": ("ParticleSystem", False),
     "particle_system_editable": ("ParticleSystem", False),
     "pose_bone": ("PoseBone", False),
-    "render_layer": ("SceneLayer", False),
     "scene": ("Scene", False),
     "sculpt_object": ("Object", False),
     "selectable_bases": ("ObjectBase", True),