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:
@@ -42,6 +42,8 @@
|
||||
|
||||
#include "MEM_guardedalloc.h"
|
||||
|
||||
#include "CLG_log.h"
|
||||
|
||||
#include "DNA_genfile.h"
|
||||
|
||||
#include "BLI_args.h"
|
||||
@@ -49,6 +51,7 @@
|
||||
#include "BLI_utildefines.h"
|
||||
#include "BLI_callbacks.h"
|
||||
#include "BLI_string.h"
|
||||
#include "BLI_system.h"
|
||||
|
||||
/* mostly init functions */
|
||||
#include "BKE_appdir.h"
|
||||
@@ -180,6 +183,11 @@ static void callback_main_atexit(void *user_data)
|
||||
#endif
|
||||
}
|
||||
|
||||
static void callback_clg_fatal(void *fp)
|
||||
{
|
||||
BLI_system_backtrace(fp);
|
||||
}
|
||||
|
||||
/** \} */
|
||||
|
||||
|
||||
@@ -304,6 +312,10 @@ int main(
|
||||
sdlewInit();
|
||||
#endif
|
||||
|
||||
/* Initialize logging */
|
||||
CLG_init();
|
||||
CLG_fatal_fn_set(callback_clg_fatal);
|
||||
|
||||
C = CTX_create();
|
||||
|
||||
#ifdef WITH_PYTHON_MODULE
|
||||
|
||||
Reference in New Issue
Block a user