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).
This commit is contained in:
@@ -26,6 +26,7 @@
|
||||
setup_libdirs()
|
||||
|
||||
blender_include_dirs(
|
||||
../../intern/clog
|
||||
../../intern/guardedalloc
|
||||
../../intern/glew-mx
|
||||
../blender/blenlib
|
||||
|
Reference in New Issue
Block a user