diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-21 16:14:42 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-21 16:14:42 +0300 |
commit | 4ceb006706579a0ad2301d2cde57489b69a7683c (patch) | |
tree | 3825806212dd3d3e5f8a44a16b9b82cfe8142c81 /build_files | |
parent | 2ae172ec32da4a1aacd268bdba45bf82cff7eea9 (diff) | |
parent | 22466a5bdff73afb6ad3afd408e265517e4f3733 (diff) |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/buildbot/config/blender_linux_player.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_files/buildbot/config/blender_linux_player.cmake b/build_files/buildbot/config/blender_linux_player.cmake index 2fb31192002..69ab984e386 100644 --- a/build_files/buildbot/config/blender_linux_player.cmake +++ b/build_files/buildbot/config/blender_linux_player.cmake @@ -1,4 +1,4 @@ -# This is applied as an ovveride on top of blender_linux.config +# This is applied as an override on top of blender_linux.config # Disables all the areas which are not needed for the player. set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE) set(WITH_CYCLES OFF CACHE BOOL "" FORCE) |