Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 22 Oct 2018 03:59:12 +0000 (14:59 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 22 Oct 2018 03:59:12 +0000 (14:59 +1100)
Reverts: 92fd931e536

intern/cycles/render/session.cpp
source/blender/windowmanager/intern/wm_files.c

index d0aa985b0350ecc07e2e013025a64f6e463c80b2..8bc175a094db9c96007771d65e6da2f0fc0d8f49 100644 (file)
@@ -682,7 +682,10 @@ DeviceRequestedFeatures Session::get_requested_device_features()
        BakeManager *bake_manager = scene->bake_manager;
        requested_features.use_baking = bake_manager->get_baking();
        requested_features.use_integrator_branched = (scene->integrator->method == Integrator::BRANCHED_PATH);
-       requested_features.use_denoising = params.use_denoising;
+       if(params.use_denoising) {
+               requested_features.use_denoising = true;
+               requested_features.use_shadow_tricks = true;
+       }
 
        return requested_features;
 }
index 1195348ed0d5c80f6b93c88ae0c14cbc65d965bf..7d3599b2f11da1e752a2e0e3ef82280a6ef4b31b 100644 (file)
@@ -2167,6 +2167,7 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
        Main *bmain = CTX_data_main(C);
        char path[FILE_MAX];
        int fileflags, orig_fileflags;
+       const bool is_save_as = (op->type->invoke == wm_save_as_mainfile_invoke);
 
        save_set_compress(op);
 
@@ -2209,11 +2210,9 @@ static int wm_save_as_mainfile_exec(bContext *C, wmOperator *op)
 
        WM_event_add_notifier(C, NC_WM | ND_FILESAVE, NULL);
 
-#if 0 /* XXX: Remove? This is not currently defined as a valid property */
-       if (RNA_boolean_get(op->ptr, "exit")) {
+       if (!is_save_as && RNA_boolean_get(op->ptr, "exit")) {
                wm_exit_schedule_delayed(C);
        }
-#endif
 
        return OPERATOR_FINISHED;
 }