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/blenderplayer | |
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/blenderplayer')
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 4b828408e45..6f32d50c2fe 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -111,7 +111,6 @@ endif() ge_player_common bf_intern_string bf_intern_ghost - bf_intern_ghostndof3dconnexion bf_rna bf_blenkernel bf_depsgraph diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index f471b535838..eb0289e6909 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -167,6 +167,7 @@ struct wmWindowManager; #include "../blender/editors/include/ED_space_api.h" #include "../blender/editors/include/ED_text.h" #include "../blender/editors/include/ED_transform.h" +#include "../blender/editors/include/ED_transform_snap_object_context.h" #include "../blender/editors/include/ED_uvedit.h" #include "../blender/editors/include/ED_view3d.h" #include "../blender/editors/include/UI_interface.h" |