Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +10
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4ff3cd2476 - Show all commits

8
source/blender/imbuf/intern/IMB_filetype.h
View File

@ -8,6 +8,10 @@
#include "IMB_imbuf.h" #include "IMB_imbuf.h"
#ifdef __cplusplus
extern "C" {
#endif
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Generic File Type /** \name Generic File Type
* \{ */ * \{ */
@ -269,3 +273,7 @@ struct ImBuf *imb_load_psd(const uchar *mem,
char colorspace[IM_MAX_SPACE]); char colorspace[IM_MAX_SPACE]);
/** \} */ /** \} */
#ifdef __cplusplus
};
#endif

2
source/blender/imbuf/intern/format_psd.cc
View File

@ -2,6 +2,8 @@
#include "oiio/openimageio_support.hh" #include "oiio/openimageio_support.hh"
#include "IMB_filetype.h"
#include "IMB_imbuf_types.h" #include "IMB_imbuf_types.h"
OIIO_NAMESPACE_USING OIIO_NAMESPACE_USING