Merge remote-tracking branch 'origin/master' into cycles_camera_nodescycles_camera_nodes

Note: the branch currently crashes in blender_camera_nodes.cpp:
BL::NodeTree b_ntree = b_data.node_groups[nodes_tree_name];

The crash was introduced in:
cb7cf523e5c000609f32a382e2c0fcc57f635a42

Conflicts:
	intern/cycles/SConscript
	intern/cycles/blender/addon/__init__.py
	intern/cycles/blender/addon/properties.py
	intern/cycles/blender/blender_camera.cpp
	intern/cycles/kernel/kernel_types.h
	intern/cycles/kernel/svm/svm.h
	intern/cycles/kernel/svm/svm_types.h
	intern/cycles/render/camera.cpp
	intern/cycles/render/camera.h

1 files changed, 48 insertions, 0 deletions

diff --git a/extern/sdlew/include/SDL2/SDL_system.h b/extern/sdlew/include/SDL2/SDL_system.h
new file mode 100644
index 00000000000..57fbb4d08e2
--- /dev/null
+++ b/extern/sdlew/include/SDL2/SDL_system.h
@@ -0,0 +1,48 @@
+
+#ifndef _SDL_system_h
+#define _SDL_system_h
+
+#include "SDL_stdinc.h"
+
+#if defined(__IPHONEOS__) && __IPHONEOS__
+#include "SDL_video.h"
+#include "SDL_keyboard.h"
+#endif
+
+#include "begin_code.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__IPHONEOS__) && __IPHONEOS__
+
+typedef int SDLCALL tSDL_iPhoneSetAnimationCallback(SDL_Window * window, int interval, void (*callback)(void*), void *callbackParam);
+typedef void SDLCALL tSDL_iPhoneSetEventPump(SDL_bool enabled);
+
+#endif
+
+#if defined(__ANDROID__) && __ANDROID__
+
+typedef void * SDLCALL tSDL_AndroidGetJNIEnv();
+
+typedef void * SDLCALL tSDL_AndroidGetActivity();
+
+#define SDL_ANDROID_EXTERNAL_STORAGE_READ   0x01
+#define SDL_ANDROID_EXTERNAL_STORAGE_WRITE  0x02
+
+typedef const char * SDLCALL tSDL_AndroidGetInternalStoragePath();
+
+typedef int SDLCALL tSDL_AndroidGetExternalStorageState();
+
+typedef const char * SDLCALL tSDL_AndroidGetExternalStoragePath();
+
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif
+