Merge remote-tracking branch 'origin/master' into blender2.8

2018-10-22 10:19:06 -06:00
parent 9d81e937d2 86dbbd156f
commit 4bf4da12de
8 changed files with 80 additions and 3 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -567,6 +567,9 @@ if(WIN32)

 	option(WINDOWS_USE_VISUAL_STUDIO_FOLDERS "Organize the visual studio project according to source folders." ON)
 	mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_FOLDERS)
+
+	option(WINDOWS_PYTHON_DEBUG "Include the files needed for debugging python scripts with visual studio 2017+." OFF)
+	mark_as_advanced(WINDOWS_PYTHON_DEBUG)
 endif()

 # avoid using again