Merge branch 'blender-v2.93-release'
This commit is contained in:
commit
67a52c8a40
|
@ -494,12 +494,7 @@ static void eevee_render_to_image(void *vedata,
|
|||
|
||||
/* Previous motion step. */
|
||||
if (do_motion_blur_fx) {
|
||||
if (i > 0) {
|
||||
/* The previous step of this iteration N is exactly the next step of iteration N - 1.
|
||||
* So we just swap the resources to avoid too much re-evaluation. */
|
||||
EEVEE_motion_blur_swap_data(vedata);
|
||||
}
|
||||
else {
|
||||
if (i == 0) {
|
||||
EEVEE_motion_blur_step_set(ved, MB_PREV);
|
||||
DRW_render_set_time(engine, depsgraph, floorf(time_prev), fractf(time_prev));
|
||||
EEVEE_render_modules_init(vedata, engine, depsgraph);
|
||||
|
@ -570,6 +565,14 @@ static void eevee_render_to_image(void *vedata,
|
|||
DRW_cache_restart();
|
||||
}
|
||||
}
|
||||
|
||||
if (do_motion_blur_fx) {
|
||||
/* The previous step of next iteration N is exactly the next step of this iteration N - 1.
|
||||
* So we just swap the resources to avoid too much re-evaluation.
|
||||
* Note that this also clears the VBO references from the GPUBatches of deformed
|
||||
* geometries. */
|
||||
EEVEE_motion_blur_swap_data(vedata);
|
||||
}
|
||||
}
|
||||
|
||||
EEVEE_volumes_free_smoke_textures();
|
||||
|
|
|
@ -78,14 +78,12 @@ static short get_bezt_sel_triple_flag(BezTriple *bezt, const bool handles_visibl
|
|||
flag = ((bezt->f1 & SELECT) ? SEL_F1 : 0) | ((bezt->f2 & SELECT) ? SEL_F2 : 0) |
|
||||
((bezt->f3 & SELECT) ? SEL_F3 : 0);
|
||||
}
|
||||
else {
|
||||
if (bezt->f2 & SELECT) {
|
||||
flag = SEL_ALL;
|
||||
}
|
||||
else if (bezt->f2 & SELECT) {
|
||||
flag = SEL_ALL;
|
||||
}
|
||||
|
||||
/* Special case for auto & aligned handles */
|
||||
if (flag != SEL_ALL && flag & SEL_F2) {
|
||||
if ((flag != SEL_ALL) && (flag & SEL_F2)) {
|
||||
if (ELEM(bezt->h1, HD_AUTO, HD_ALIGN) && ELEM(bezt->h2, HD_AUTO, HD_ALIGN)) {
|
||||
flag = SEL_ALL;
|
||||
}
|
||||
|
@ -316,7 +314,7 @@ static void createTransGPencil_curves(bContext *C,
|
|||
}
|
||||
}
|
||||
else if (handles_visible) {
|
||||
if (BEZT_ISSEL_IDX(bezt, j)) {
|
||||
if (sel) {
|
||||
td->flag = TD_SELECTED;
|
||||
}
|
||||
else {
|
||||
|
|
Loading…
Reference in New Issue