griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.1-release'

Browse Source
This commit is contained in:
Jesse Yurkovich
2024-03-01 13:15:42 -08:00
parent 8791153a7b 1597e9386f
commit 833791772c
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenloader/intern/versioning_defaults.cc
View File

@@ -850,4 +850,12 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
brush->automasking_view_normal_falloff = default_brush->automasking_view_normal_falloff;
}
}
{
LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
if (!brush->automasking_cavity_curve) {
brush->automasking_cavity_curve = BKE_sculpt_default_cavity_curve();
}
}
}
}

7
source/blender/io/alembic/exporter/abc_export_capi.cc
View File

@@ -83,7 +83,6 @@ static void export_startjob(void *customdata, wmJobWorkerStatus *worker_status)
worker_status->progress = 0.0f;
worker_status->do_update = true;
build_depsgraph(data->depsgraph, data->params.visible_objects_only);
SubdivModifierDisabler subdiv_disabler(data->depsgraph);
if (!data->params.apply_subdiv) {
subdiv_disabler.disable_modifiers();
@@ -208,6 +207,12 @@ bool ABC_export(Scene *scene,
job->depsgraph = DEG_graph_new(job->bmain, scene, view_layer, params->evaluation_mode);
job->params = *params;
/* Construct the depsgraph for exporting.
*
* Has to be done from main thread currently, as it may affect Main original data (e.g. when
* doing deferred update of the view-layers, see #112534 for details). */
blender::io::alembic::build_depsgraph(job->depsgraph, job->params.visible_objects_only);
bool export_ok = false;
if (as_background_job) {
wmJob *wm_job = WM_jobs_get(