May 6, 2016, 16:13 (GMT) |
Merge branch 'master' into experimental-build |
May 6, 2016, 15:40 (GMT) |
Cycles: Use separate values for merge start and end angles It's handy to merge eyes before reaching the zenith. |
May 6, 2016, 14:54 (GMT) |
Clip invisible parts of image when drawing in 2D textures and GLSL Modes This commit avoids draw of invisible parts of image in image editor, making it faster to re-draw the image. Especially handy when painting on a high-res image when zoomed-in. |
Revision 105a1d8 by Clément Fukhaut (pbr-viewport) May 6, 2016, 13:55 (GMT) |
Huge codebase changes : - Made ssfx "module" to manage screen space effects applied at material stage - Moved probe functions to their own module - Divided Shading glsl file into bits that are gathered when making glsl_material_library making files shorter and more organized - Moved function generating luts and random texture to gpu_luts.c that will contains all textures needed to acheive some effects. - GPU_PBR in GPUBuiltin is just a placeholder to trigger the uniform binding Optimisation / correction : - GLSL : Number of bsdf sample is now passed via an uniform instead of a #define. This means changing quality settings will no longer recompute every shaders in the scene. But this has a small perf cost. - GLSL : Hammersley numbers are precalculated and stored inside a texture. This may have a performance impact and I will change it to a static table. - GLSL : Random per pixel numbers are done using a texture like SSAO. - GLSL : Lots of parameters (only for pbr) are now defined as uniform and passed at binding stage (this minimize the use of GPU_builtin). - GLSL : most variables used in sampling algorythm are defined as global variables. - Bsdf sampling is now using the real algorithm and not the split sum approximation (which was unecessary). Features : - Added toon shader support (only point light support). - Added holdout. |
Revision 80f0370 by Clément Fukhaut (pbr-viewport) May 6, 2016, 13:13 (GMT) |
Fix Opengl problem on OSX |
May 6, 2016, 12:57 (GMT) |
fixed include paths |
May 6, 2016, 12:55 (GMT) |
formatting (indentation) smoke script to match liquid and mantaflow scripts in general |
May 6, 2016, 12:39 (GMT) |
Cleanup: Move full SVM statistics to VLOG(2) verbosity level. |
May 6, 2016, 12:37 (GMT) |
Cleanup: Rename texture slots to float4 and byte, to distinguish from future float (single channel) and half_float slots. Should be no functional changes, tested CPU and CUDA. |
May 6, 2016, 11:44 (GMT) |
Cycles: Pole merging for spherical stereo The idea of pole merge is to fade interocular distance after a certain altitude to zero when altitude goes closer to a pole. This should prevent annoyances looking up in the sky. Not optimal or something, but sohuld be good enough for testing. |
May 6, 2016, 11:34 (GMT) |
Merge branch 'asset-engine' into asset-experiments |
May 6, 2016, 11:34 (GMT) |
Merge branch 'id-remap' into asset-experiments |
May 6, 2016, 11:33 (GMT) |
Merge branch 'master' into asset-experiments |
May 6, 2016, 11:30 (GMT) |
Merge branch 'master' into asset-engine |
Revision cbe6475 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 6, 2016, 11:28 (GMT) |
Merge branch 'master' into id-remap |
May 6, 2016, 11:20 (GMT) |
Code refactor: Change Cycles ImageManager arrays. This commit simplifies the code for the image arrays. Instead of having 2 arrays for float and byte textures, we now use an array here. This simplifies the code (avoids code duplication), and makes it possible to easily extend it with float1 and half-float types in the future. Only tested with CPU yet, plus some cleanup / code de-duplication is still possible here. Reviewers: #cycles, sergey Reviewed By: #cycles, sergey Subscribers: jesterking, sergey Differential Revision: https://developer.blender.org/D1969 |
May 6, 2016, 11:16 (GMT) |
First 'working' version of asset reload. Dead dummy simplistic test runs (nearly) OK here (only have a memleak from versionning code...), but obviously will need much serious tests to validate everything. Also, many things in code will need cleanup/refactor. Not to mention UI/UX. But we do have asset version check & reload on file opening now! :D Process summary: I) Open .blend file exactly as in master, load assets just like any other linked data (add placeholders in case not found). II) Check all asset engines and ask them whether each asset is OK, needs to be updated/reloaded, is missing... III) User then can decide to actually reload the asset, or not. Step II) happens in an async job (since engines using remote storage/database could take some time to answer), step III) is a locking task (just like initial linking). This should allow user to not be blocked at all by that asset update process. |
May 6, 2016, 11:05 (GMT) |
Merge branch 'id-remap' into asset-experiments Conflicts: source/blender/blenloader/intern/readfile.c |
Revision 961ebfa by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) May 6, 2016, 11:03 (GMT) |
Set a main's version to current one after do_version is done. With current master this is not an issue, but with all the reload stuff, a same main could end up going several time into 'do_version', which is absolutely not desired (multi-allocations, repeating conversions over some values, etc.). |
May 6, 2016, 10:32 (GMT) |
Tweak precision for interocular distance and convergence plane Previous number of digits after point was not really useful, especially for the interocular distance where it's quite common to go sub-cm precision. |
|
|
|


Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021