main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Showing only changes of commit b9af4f6748 - Show all commits

View File

@ -11,10 +11,8 @@
#include "MEM_guardedalloc.h"
#include "BLI_alloca.h"
#include "BLI_blenlib.h"
#include "BLI_fileops_types.h"
#include "BLI_math.h"
#include "BLI_utildefines.h"
#ifdef WIN32
@ -24,7 +22,6 @@
#include "BIF_glutil.h"
#include "BKE_context.h"
#include "BKE_main.h"
#include "BLO_readfile.h"
@ -55,8 +52,6 @@
#include "GPU_immediate_util.h"
#include "GPU_state.h"
#include "AS_asset_representation.h"
#include "filelist.h"
#include "file_intern.h" /* own include */