diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-01 12:03:25 +0300 |
commit | b65ea517eb932bde950bde51979c6a3fd258efa8 (patch) | |
tree | 8f3a291a7e1778bb3af45cdb1d98a621efbd1a7d /source/blender/imbuf | |
parent | 916c91bd08933d596eaca3e369467daf7964612e (diff) | |
parent | 473f17b3d557adbb06b89e0a186be48a0129086d (diff) |
Merge branch 'master' into blender2.8
- Undo that changes modes currently asserts,
since undo is now screen data.
Most likely we will change how object mode and workspaces work
since it's not practical/maintainable at the moment.
- Removed view_layer from particle settings
(wasn't needed and complicated undo).
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/thumbs_blend.c | 1 | ||||
-rw-r--r-- | source/blender/imbuf/intern/util.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index a770b34ecc6..979b7d9b814 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -68,7 +68,6 @@ #include "MEM_guardedalloc.h" -#include "BKE_global.h" #ifdef WITH_AVI # include "AVI_avi.h" diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c index 00fb1a44dff..efcd7d1f35f 100644 --- a/source/blender/imbuf/intern/thumbs_blend.c +++ b/source/blender/imbuf/intern/thumbs_blend.c @@ -37,7 +37,6 @@ #include "BLO_blend_defs.h" #include "BLO_readfile.h" -#include "BKE_global.h" #include "BKE_idcode.h" #include "BKE_icons.h" #include "BKE_library.h" diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 76a44aa81f7..2b6963b9170 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -43,7 +43,6 @@ #include "BLI_fileops.h" #include "BLI_string.h" -#include "BKE_global.h" #include "imbuf.h" #include "IMB_imbuf_types.h" |