[Bf-blender-cvs] [dd8ef896332] soc-2019-openxr: Remove leftover from merge conflict

Julian Eisel noreply at git.blender.org
Wed Mar 11 20:28:25 CET 2020


Commit: dd8ef896332260fd1f9f21fc61435f434faba120
Author: Julian Eisel
Date:   Wed Mar 11 16:31:50 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rBdd8ef896332260fd1f9f21fc61435f434faba120

Remove leftover from merge conflict

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

M	source/creator/CMakeLists.txt

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

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 9b6041c2e2a..bbef3a4d52a 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -82,9 +82,6 @@ endif()
 
 if(WITH_PYTHON)
   blender_include_dirs(../blender/python)
-  list(APPEND LIB
-    bf_python
-  )
   add_definitions(-DWITH_PYTHON)
 
   if(WITH_PYTHON_SECURITY)



More information about the Bf-blender-cvs mailing list