diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:21:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:27:03 +0300 |
| commit | 941484ff81744ad2dca1741f3e9c4b4c18664a82 (patch) | |
| tree | 3d80e516e39a7d55be8439c2ce3e06943de0a3f6 /intern | |
| parent | 0dd98af2559b89149f2b6ae586969c0544c26369 (diff) | |
| parent | 7fb393f9ba3866026c8fb2c5c5ef7e0906cfe8b4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/app/cycles_standalone.cpp | 8 | ||||
| -rw-r--r-- | intern/cycles/util/util_version.h | 4 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 9 |
3 files changed, 4 insertions, 17 deletions
diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp index 939c6cf7eb5..0b9a4042e0e 100644 --- a/intern/cycles/app/cycles_standalone.cpp +++ b/intern/cycles/app/cycles_standalone.cpp @@ -130,11 +130,11 @@ static void session_init() options.session->progress.set_update_callback(function_bind(&view_redraw)); #endif - options.session->start(); - /* load scene */ scene_init(); options.session->scene = options.scene; + + options.session->start(); } static void session_exit() @@ -143,10 +143,6 @@ static void session_exit() delete options.session; options.session = NULL; } - if(options.scene) { - delete options.scene; - options.scene = NULL; - } if(options.session_params.background && !options.quiet) { session_print("Finished Rendering."); diff --git a/intern/cycles/util/util_version.h b/intern/cycles/util/util_version.h index d609c739ac7..112255f447b 100644 --- a/intern/cycles/util/util_version.h +++ b/intern/cycles/util/util_version.h @@ -22,8 +22,8 @@ CCL_NAMESPACE_BEGIN #define CYCLES_VERSION_MAJOR 1 -#define CYCLES_VERSION_MINOR 8 -#define CYCLES_VERSION_PATCH 1 +#define CYCLES_VERSION_MINOR 9 +#define CYCLES_VERSION_PATCH 0 #define CYCLES_MAKE_VERSION_STRING2(a,b,c) #a "." #b "." #c #define CYCLES_MAKE_VERSION_STRING(a,b,c) CYCLES_MAKE_VERSION_STRING2(a,b,c) diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index b4fb788bca9..e9fffb6f60b 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -283,16 +283,7 @@ extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) * CocoaAppDelegate * ObjC object to capture applicationShouldTerminate, and send quit event **/ -#if defined(__clang_major__) && __clang_major__ <= 7 -/* FIXME(merwin & Juicyfruit): long-term fix for proper protocol to use - * merwin thinks NSApplicationDelegate is the correct protocol here. Has been around since 10.6 so we should be good... what's the problem? - * https://developer.apple.com/reference/appkit/nsapplicationdelegate?language=objc - */ -@interface CocoaAppDelegate : NSObject <NSFileManagerDelegate> { -#else -/* for Xcode 8 */ @interface CocoaAppDelegate : NSObject <NSApplicationDelegate> { -#endif GHOST_SystemCocoa *systemCocoa; } |