Commit: 240ac779d585520a7dcea6a623b2e2ae082fb6f1
Author: Clément Foucault
Date: Wed Aug 12 18:16:47 2020 +0200
Branches: master
https://developer.blender.org/rB240ac779d585520a7dcea6a623b2e2ae082fb6f1
Merge branch 'blender-v2.90-release'
# Conflicts:
# source/blender/draw/engines/eevee/eevee_motion_blur.c
===================================================================
===================================================================
diff --cc source/blender/draw/engines/eevee/eevee_motion_blur.c
index 2a315927015,91a9939cd1f..fa517e2d5c9
--- a/source/blender/draw/engines/eevee/eevee_motion_blur.c
+++ b/source/blender/draw/engines/eevee/eevee_motion_blur.c
@@@ -484,16 -490,10 +490,8 @@@ void EEVEE_motion_blur_cache_finish(EEV
GPU_VERTBUF_DISCARD_SAFE(mb_geom->vbo[MB_NEXT]);
break;
}
- else {
- /* Modify the batch to include the previous & next position.
*/
- GPU_batch_vertbuf_add_ex(batch, vbo, false);
- }
+
- /* Modify the batch to include the previous & next position. */
- if (i == MB_PREV) {
- GPU_batch_vertbuf_add_ex(batch, vbo, true);
- mb_geom->vbo[i] = NULL;
- }
- else {
- /* This VBO can be reuse by next time step. Don't pass
ownership. */
- GPU_batch_vertbuf_add_ex(batch, vbo, false);
- }
++ GPU_batch_vertbuf_add_ex(batch, vbo, false);
}
}
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
