Merge branch 'blender-v2.92-release'

This commit is contained in:
Antonio Vazquez
2021-02-01 11:01:29 +01:00
2 changed files with 10 additions and 0 deletions

View File

@@ -167,6 +167,8 @@ static void scene_init_data(ID *id)
&gp_primitive_curve->clipr,
CURVE_PRESET_BELL,
CURVEMAP_SLOPE_POSITIVE);
/* Grease pencil interpolate. */
scene->toolsettings->gp_interpolate.step = 1;
scene->unit.system = USER_UNIT_METRIC;
scene->unit.scale_length = 1.0f;

View File

@@ -629,6 +629,14 @@ void GPENCIL_cache_populate(void *ved, Object *ob)
}
}
/* When render in background the active frame could not be properly set due thread priority
* better set again. This is not required in viewport. */
if (txl->render_depth_tx) {
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd->layers) {
gpl->actframe = BKE_gpencil_layer_frame_get(gpl, pd->cfra, GP_GETFRAME_USE_PREV);
}
}
BKE_gpencil_visible_stroke_iter(is_final_render ? pd->view_layer : NULL,
ob,
gpencil_layer_cache_populate,