diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-07-07 17:06:52 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-07-07 17:17:40 +0300 |
commit | 1357dd7d3cf2d0cb5c574fa518136a4654869493 (patch) | |
tree | 90da62d31f81cafc549e5ab224e1536c569297e7 /source/blender/makesrna | |
parent | 084d545202c27fda5117817491c8d5761b4daafc (diff) |
Cleanup: move enum unto BKE_packedFile.h
Use enum type for functions arguments.
Removed -1 check in switch statement, this isn't needed.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_image_api.c | 3 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_packedfile.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sound_api.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_vfont_api.c | 4 |
4 files changed, 8 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_image_api.c b/source/blender/makesrna/intern/rna_image_api.c index 0db099e3e1d..d167c650683 100644 --- a/source/blender/makesrna/intern/rna_image_api.c +++ b/source/blender/makesrna/intern/rna_image_api.c @@ -36,13 +36,14 @@ #include "RNA_define.h" #include "RNA_enum_types.h" +#include "BKE_packedFile.h" + #include "rna_internal.h" /* own include */ #ifdef RNA_RUNTIME # include <errno.h> # include "BKE_image.h" -# include "BKE_packedFile.h" # include "BKE_main.h" # include "IMB_imbuf.h" diff --git a/source/blender/makesrna/intern/rna_packedfile.c b/source/blender/makesrna/intern/rna_packedfile.c index 0b1b48b1bd3..dda1c637f39 100644 --- a/source/blender/makesrna/intern/rna_packedfile.c +++ b/source/blender/makesrna/intern/rna_packedfile.c @@ -27,6 +27,8 @@ #include "RNA_define.h" #include "RNA_enum_types.h" +#include "BKE_packedFile.h" + #include "rna_internal.h" const EnumPropertyItem rna_enum_unpack_method_items[] = { diff --git a/source/blender/makesrna/intern/rna_sound_api.c b/source/blender/makesrna/intern/rna_sound_api.c index 1482a08b893..2be0ed966f1 100644 --- a/source/blender/makesrna/intern/rna_sound_api.c +++ b/source/blender/makesrna/intern/rna_sound_api.c @@ -26,12 +26,12 @@ #include "RNA_define.h" #include "RNA_enum_types.h" +#include "BKE_packedFile.h" + #include "rna_internal.h" #ifdef RNA_RUNTIME -# include "BKE_packedFile.h" - static void rna_Sound_pack(bSound *sound, Main *bmain, ReportList *reports) { sound->packedfile = BKE_packedfile_new(reports, sound->name, ID_BLEND_PATH(bmain, &sound->id)); diff --git a/source/blender/makesrna/intern/rna_vfont_api.c b/source/blender/makesrna/intern/rna_vfont_api.c index bdd73bbb3a6..a85dde5d8b1 100644 --- a/source/blender/makesrna/intern/rna_vfont_api.c +++ b/source/blender/makesrna/intern/rna_vfont_api.c @@ -26,12 +26,12 @@ #include "RNA_define.h" #include "RNA_enum_types.h" +#include "BKE_packedFile.h" + #include "rna_internal.h" #ifdef RNA_RUNTIME -# include "BKE_packedFile.h" - static void rna_VectorFont_pack(VFont *vfont, Main *bmain, ReportList *reports) { vfont->packedfile = BKE_packedfile_new(reports, vfont->name, ID_BLEND_PATH(bmain, &vfont->id)); |