diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 19:35:14 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 19:35:14 +0300 |
| commit | f71efafe8fc43083dcf573d258a1a5511d522702 (patch) | |
| tree | 5d8f5e32c6a6a8aa43cb8679230b756328d5d8ad /source/blender/editors/space_image/image_edit.c | |
| parent | df22cd9ce160457bda1a976da4dd6e7079f36865 (diff) | |
| parent | cfea9c261c2349e03c5ce38a04659479901ce815 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_image/image_edit.c
source/blender/editors/space_image/image_ops.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_sculpt_paint.c
source/blender/makesrna/intern/rna_space.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/editors/space_image/image_edit.c')
| -rw-r--r-- | source/blender/editors/space_image/image_edit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c index c598e486a7e..19829517e00 100644 --- a/source/blender/editors/space_image/image_edit.c +++ b/source/blender/editors/space_image/image_edit.c @@ -41,6 +41,7 @@ #include "BKE_image.h" #include "BKE_editmesh.h" #include "BKE_library.h" +#include "BKE_main.h" #include "IMB_imbuf_types.h" |