diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-02 16:18:10 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-02 16:18:10 +0300 |
| commit | 89fdd8890633700f559039998f8d95c7a5f97df4 (patch) | |
| tree | a77306882df479d5d2d89f0f9d3529394b4fbe01 /build_files | |
| parent | 57bbd478a58a944a8f3146af25cfe34ee055fc86 (diff) | |
| parent | 4ffa05c30b10eb8a07dd0a9b43466f6d11bc1364 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index dfac6d1798e..3fac56ba554 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -565,8 +565,7 @@ function(SETUP_BLENDER_SORTED_LIBS) set(BLENDER_SORTED_LIBS bf_windowmanager - # needed twice because of text undo - bf_editor_util + bf_editor_undo bf_editor_space_api bf_editor_space_action |