diff options
author | Hans Goudey <h.goudey@me.com> | 2022-05-30 20:05:25 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-05-30 20:05:25 +0300 |
commit | 4d252b5aca9a459540882aa18e1633f526d4e0e4 (patch) | |
tree | 11a6fe584d27cc7ebdf6aebc9c747a189a74de8e /source/blender/blenloader | |
parent | 947154b1f6d9b9498afd4b4e8b98e308ede9bc9d (diff) | |
parent | b24e091c5a99388a584568271ddf3d3b2f1f4388 (diff) |
Merge branch 'master' into temp-legacy-mesh-format-option
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index 74621a477cd..83d325e9c40 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -63,7 +63,7 @@ #include "RNA_prototypes.h" #include "BLO_readfile.h" -#include "MEM_guardedalloc.h" + #include "readfile.h" #include "SEQ_channels.h" @@ -71,8 +71,6 @@ #include "SEQ_sequencer.h" #include "SEQ_time.h" -#include "RNA_access.h" - #include "versioning_common.h" static CLG_LogRef LOG = {"blo.readfile.doversion"}; |