diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-07 15:19:16 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-04-07 15:19:16 +0300 |
| commit | e5a47562eb55b6434b8a141f896c1ee0f89d4b25 (patch) | |
| tree | 918b07a4d067ff1c11e3760b3c494f645a8e4fb5 /source/blender/windowmanager/intern/wm_init_exit.c | |
| parent | 7ffdbecdbf6f0f8f14dd5d5636401512a6e643cc (diff) | |
| parent | d60ff6c112b1c5d3819676109b0080a316850eb0 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/object_dupli.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/makesdna/DNA_sequence_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c
Diffstat (limited to 'source/blender/windowmanager/intern/wm_init_exit.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index b1bb45686fc..8edccbce25d 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -60,7 +60,7 @@ #include "BKE_global.h" #include "BKE_library.h" #include "BKE_main.h" -#include "BKE_mball.h" +#include "BKE_mball_tessellate.h" #include "BKE_node.h" #include "BKE_report.h" |