diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-05-24 17:48:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-05-24 17:48:10 +0300 |
| commit | faec4309147988fbab7b7d7ec661f5130358d169 (patch) | |
| tree | 0c839f8f88fe80f4a3762980adb5efe729ce1b44 /source/creator/creator.c | |
| parent | f85745b17bfe68673bf5f799e98c617d9471ddf1 (diff) | |
| parent | e1dd83b399d46d81ea51f6c41725eec5c1a1db7a (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/blender_curves.cpp
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/particle.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/transform/transform_snap_object.c
source/blender/editors/util/undo.c
source/blender/makesrna/intern/rna_object_force.c
Diffstat (limited to 'source/creator/creator.c')
| -rw-r--r-- | source/creator/creator.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/creator/creator.c b/source/creator/creator.c index d253cbad177..9236e01a703 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -42,10 +42,6 @@ #include "MEM_guardedalloc.h" -#ifdef WIN32 -# include "BLI_winstuff.h" -#endif - #include "BLI_args.h" #include "BLI_threads.h" #include "BLI_utildefines.h" |