Revision 6535ce6 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) February 7, 2019, 14:37 (GMT) |
Merge branch 'master' into greasepencil-object |
February 6, 2019, 22:08 (GMT) |
Merge remote-tracking branch 'origin' into openimagedenoise # Conflicts: # build_files/cmake/platform/platform_apple.cmake # source/blender/compositor/CMakeLists.txt # source/blender/nodes/CMakeLists.txt |
Revision cee3b7b by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) February 6, 2019, 09:02 (GMT) |
Merge branch 'master' into greasepencil-object Conflicts: source/blender/draw/engines/gpencil/gpencil_render.c |
February 5, 2019, 14:19 (GMT) |
Cleanup in denoiser compositing node. |
Revision 856ad07 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) February 5, 2019, 11:10 (GMT) |
Merge branch 'master' into greasepencil-object Conflicts: source/blender/makesrna/intern/rna_brush.c |
February 4, 2019, 21:32 (GMT) |
Fixed code style. |
February 4, 2019, 21:28 (GMT) |
Compositor: Added denoising node This node is built on Intel's OpenImageDenoise library. Other denoisers could be integrated, for example Lukas' work. Compositor: Made OpenImageDenoise optional, added CMake and build_env files to find OIDN Compositor: Fixed some warnings in the denoising operator build_environment: Updated OpenImageDenoise to 0.8.1 build_environment: Updated OpenImageDenoise in `make deps` for macOS Differential Revision: https://developer.blender.org/D4304 |
Revision 41f2a8c by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) February 4, 2019, 19:01 (GMT) |
GP: Cleanup blend render functions This is the first step to try to fix the problems with colors. |
February 4, 2019, 14:55 (GMT) |
build_environment: Updated OpenImageDenoise to 0.8.1 |
February 4, 2019, 13:27 (GMT) |
Compositor: Fixed some warnings in the denoising operator |
February 4, 2019, 13:23 (GMT) |
Compositor: Made OpenImageDenoise optional, added CMake and build_env files to find OIDN |
February 4, 2019, 10:30 (GMT) |
Merge branch 'master' into asset-engine Conflicts: source/blender/blenkernel/BKE_global.h source/blender/python/intern/bpy_app.c |
February 4, 2019, 02:20 (GMT) |
Merge branch 'master' into temp-clang-format |
February 3, 2019, 11:41 (GMT) |
partial fix for wrong rotation when converting to keyframes forgot to initialize ob->quat for passive objects, they are most likely in euler rotation mode still and the ob->quat seems not automatically in sync |
Revision 7a6daa6 by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) February 2, 2019, 08:34 (GMT) |
Merge branch 'master' into greasepencil-object |
February 1, 2019, 22:47 (GMT) |
Merge branch 'master' into temp-clang-format |
February 1, 2019, 22:45 (GMT) |
Use 4 spaces for continuations, addresses T53211#611987 Before: ``` if ( psmd->mesh_final->totvert != psmd->totdmvert || psmd->mesh_final->totedge != psmd->totdmedge || psmd->mesh_final->totface != psmd->totdmface) { psys->recalc |= ID_RECALC_PSYS_RESET; psmd->totdmvert = psmd->mesh_final->totvert; psmd->totdmedge = psmd->mesh_final->totedge; psmd->totdmface = psmd->mesh_final->totface; } ``` After: ``` if (psmd->mesh_final->totvert != psmd->totdmvert || psmd->mesh_final->totedge != psmd->totdmedge || psmd->mesh_final->totface != psmd->totdmface) { psys->recalc |= ID_RECALC_PSYS_RESET; psmd->totdmvert = psmd->mesh_final->totvert; psmd->totdmedge = psmd->mesh_final->totedge; psmd->totdmface = psmd->mesh_final->totface; } ``` |
Revision 5aee6cb by Antonio Vazquez (greasepencil-experimental, greasepencil-object, greasepencil-refactor, soc-2019-npr, temp-gpencil-eval) February 1, 2019, 16:15 (GMT) |
Merge branch 'master' into greasepencil-object |
February 1, 2019, 15:24 (GMT) |
Test not aligning escaped newlines They're annoying to edit if you ever dont have auto-formatting enabled and with 100 char width, they may run off the screen. |
February 1, 2019, 15:15 (GMT) |
Fix expanding tabs for 2 space indentation. |
|