[Bf-blender-cvs] [b7f7b5bb396] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: b7f7b5bb396f887f0917e115a3e0707c7c5aa8ba
Author: Antonio Vazquez
Date:   Tue Dec 1 16:17:49 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb7f7b5bb396f887f0917e115a3e0707c7c5aa8ba

Merge branch 'master' into greasepencil-object

 Conflicts:
	build_files/cmake/platform/platform_win32.cmake

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



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

diff --cc build_files/cmake/platform/platform_win32.cmake
index 1ea47b45d43,3954a5f143c..852e45b1341
--- a/build_files/cmake/platform/platform_win32.cmake
+++ b/build_files/cmake/platform/platform_win32.cmake
@@@ -722,7 -724,7 +724,7 @@@ if(WINDOWS_PYTHON_DEBUG
      string(REPLACE "/" "\\" _group_path "${_source_path}")
      source_group("${_group_path}" FILES "${_source}")
    endforeach()
--  
++
    # If the user scripts env var is set, include scripts from there otherwise
    # include user scripts in the profile folder.
    if(DEFINED ENV{BLENDER_USER_SCRIPTS})
@@@ -733,7 -735,7 +735,7 @@@
      # Include the user scripts from the profile folder in the blender_python_user_scripts project.
      set(USER_SCRIPTS_ROOT "$ENV{appdata}/blender foundation/blender/${BLENDER_VERSION}/scripts")
    endif()
--  
++
    file(TO_CMAKE_PATH ${USER_SCRIPTS_ROOT} USER_SCRIPTS_ROOT)
    FILE(GLOB_RECURSE inFiles "${USER_SCRIPTS_ROOT}/*.*" )
    ADD_CUSTOM_TARGET(blender_python_user_scripts SOURCES ${inFiles})