diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-17 06:06:49 +0300 |
| commit | 0ffa64a45f7d961cb079a56629bcff105c81eb56 (patch) | |
| tree | 238bdd23687e6b54c1f75a35e5497837e8662bea /source/blender/blenloader/BLO_readfile.h | |
| parent | dd91d7d09d9994bc20bdbfb501d5101044ac99c8 (diff) | |
| parent | 99520e3f92e14eb3b7fab3f7decd0914a3da1360 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenloader/BLO_readfile.h')
| -rw-r--r-- | source/blender/blenloader/BLO_readfile.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h index fe38fc86c84..47b18be2a0b 100644 --- a/source/blender/blenloader/BLO_readfile.h +++ b/source/blender/blenloader/BLO_readfile.h @@ -54,11 +54,11 @@ struct wmWindowManager; typedef struct BlendHandle BlendHandle; -typedef enum BlenFileType { +typedef enum eBlenFileType { BLENFILETYPE_BLEND = 1, BLENFILETYPE_PUB = 2, BLENFILETYPE_RUNTIME = 3 -} BlenFileType; +} eBlenFileType; typedef struct BlendFileData { struct Main *main; @@ -72,7 +72,7 @@ typedef struct BlendFileData { struct Scene *curscene; struct SceneLayer *cur_render_layer; /* layer to activate in workspaces when reading without UI */ - BlenFileType type; + eBlenFileType type; } BlendFileData; typedef struct WorkspaceConfigFileData { |