[Bf-blender-cvs] [2bf50adc3be] cycles_procedural_api: Merge branch 'master' into cycles_procedural_api

[Kévin Dietrich]

Commit: 2bf50adc3bec29f5600122c239602d33e43dde5d
Author: Kévin Dietrich
Date:   Fri Nov 6 18:47:34 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rB2bf50adc3bec29f5600122c239602d33e43dde5d

Merge branch 'master' into cycles_procedural_api

===================================================================



===================================================================

diff --cc source/blender/io/alembic/intern/alembic_capi.cc
index 60d0d0af8e4,c9eefbf9039..07273e29db6
--- a/source/blender/io/alembic/intern/alembic_capi.cc
+++ b/source/blender/io/alembic/intern/alembic_capi.cc
@@@ -684,10 -683,9 +684,10 @@@ bool ABC_import(bContext *C
    job->settings.sequence_len = sequence_len;
    job->settings.sequence_offset = offset;
    job->settings.validate_meshes = validate_meshes;
 +  job->settings.force_modifier = force_modifier;
    job->error_code = ABC_NO_ERROR;
    job->was_cancelled = false;
-   job->archive = NULL;
+   job->archive = nullptr;
    job->is_background_job = as_background_job;
  
    G.is_break = false;