diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
| commit | b65ea517eb932bde950bde51979c6a3fd258efa8 (patch) | |
| tree | 8f3a291a7e1778bb3af45cdb1d98a621efbd1a7d /intern/CMakeLists.txt | |
| parent | 916c91bd08933d596eaca3e369467daf7964612e (diff) | |
| parent | 473f17b3d557adbb06b89e0a186be48a0129086d (diff) | |
Merge branch 'master' into blender2.8
- Undo that changes modes currently asserts,
since undo is now screen data.
Most likely we will change how object mode and workspaces work
since it's not practical/maintainable at the moment.
- Removed view_layer from particle settings
(wasn't needed and complicated undo).
Diffstat (limited to 'intern/CMakeLists.txt')
| -rw-r--r-- | intern/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt index af3b9296077..4b3ccfc808a 100644 --- a/intern/CMakeLists.txt +++ b/intern/CMakeLists.txt @@ -24,6 +24,7 @@ # ***** END GPL LICENSE BLOCK ***** # add_subdirectory(atomic) # header only +add_subdirectory(clog) add_subdirectory(string) add_subdirectory(ghost) add_subdirectory(guardedalloc) |