diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-27 16:59:01 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-06-27 16:59:01 +0300 |
| commit | cbce7fef1604fdfd3099fd196b2a44f61b22eb76 (patch) | |
| tree | b11963a42641ef95c61c01a7b2b83dddce4cd1a2 /source/blender/blenkernel/CMakeLists.txt | |
| parent | c2dc77983dc4d3271858737a15ee058ef48fb833 (diff) | |
| parent | e2c7ee773311734450a229051673fbfea61b641a (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenkernel/intern/pointcache.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_particle.c
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index df715531cb7..74930dbea4a 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -49,9 +49,6 @@ set(INC ../../../intern/smoke/extern ../../../intern/atomic ../../../intern/libmv - - # XXX - BAD LEVEL CALL WM_api.h - ../windowmanager ) set(INC_SYS |