Revision 81edad9 by Bastien Montagne (asset-engine, asset-engine--archived, asset-experiments, id-remap) November 28, 2015, 20:45 (GMT) |
Merge branch 'master' into id-remap |
November 28, 2015, 18:52 (GMT) |
install_deps.sh: always give py version arg to cmake/scons (same as we already do with llvm). This should avoid 'casual builders' to have issues when we switch py versions. |
November 28, 2015, 18:52 (GMT) |
Move linux's scons to py3.5 too! |
November 28, 2015, 17:24 (GMT) |
UI: More minor UI cleanups for keymap editor Place non-editor related keymaps together, place animation editor keymaps together, move 'Header' keymap (which had exactly 1 entry) into 'Screen' keymap, move SCREEN_OT_header (for showing/hiding header) into 'Header' keymap. Again, this shouldn't break any key configs, but key configs that contain SCREEN_OT_header will add an entry for this under 'Screen' again. Just a very minor glitch. |
November 28, 2015, 17:08 (GMT) |
Render pipeline: Remove dead code Remained since some rather recent render speedup commits. |
November 28, 2015, 16:46 (GMT) |
UI Cleanup: Mask keymap shouldn't be part of Clip Editor keymap Also removed unrelated comment (copied & pasted from a few lines above I guess). Shouldn't break any custom key configs. |
November 28, 2015, 16:22 (GMT) |
Cleanup: 'area' vs 'region' Apparently this is the result of some sloppiness during 2.5 project and since then it confused people who were trying to understand the area-region relation (myself included). Sorry if this causes merge conflicts for anyone, but at some point we really had to do it :/ |
November 28, 2015, 16:20 (GMT) |
C++ RNA: Pass structures by reference C++ structures might be rather big and passing them by value is not really optimal. There should be no functional changes apart from better memory access pattern when synchronizing huge scenes to Cycles. |
November 28, 2015, 16:07 (GMT) |
Generate instructions for a subgraph in a separate codegen function. This will be useful for separately generating kernel functions, which are to be stored as own code blocks so kernels can call them repeatedly as needed. |
November 28, 2015, 16:05 (GMT) |
Cycles: Avoid having two consequence getenv() calls |
November 28, 2015, 15:07 (GMT) |
Cycles: Fix wrong volume stack after SSS bounce Was introduced by a recent fixes, now it should be all correct and additionally it solves the TODO mentioned in the code. |
November 28, 2015, 15:07 (GMT) |
Cycles: Fix wrong original ray used for SSS baking Also de-duplicated some code by moving to an utility function. |
November 28, 2015, 15:07 (GMT) |
Cycles: Set of fixes for delayed SSS ray tracing There were multiple issues which are solved now: - It was possible that ray wouldn't be bounced off the BSSRDF, for example when PDF or shader eval is zero. In this case PathState might have been left in pre-bounced state which would have been gave incorrect shading results. This is solved by having separate PathState for each of the hits. - Path radiance summing wasn't happening correct as well, indirect rays were using wrong path radiance in the case when there were more than one hit recorded. This is now using a bit trickier state machine which calculates path radiance for just SSS (both direct and indirect) and then sums it back to the final radiance. - Previous commit wasn't totally correct either and was an induced bug due to wrong path state left from the "un-happened" ray bounce. There should be no special case happening here, BSSRDFs will be replaced with diffuse ones due to PATH_RAY_DIFFUSE_ANCESTOR flag. - Merged back codebases for "delayed" and "immediate" indirect SSS ray tracing, hopefully making it easier to maintain the codebase. Sure this changes brings memory usage back by about 4-5%, but overall it's still about 2x memory reduction for the experimental kernel here. Thanks Brecht for the review! |
November 28, 2015, 15:07 (GMT) |
Cycles: Fallback to diffuse BSDF for the indirect SSS rays when BSSRDF is hit This is actually how it was intended to work, just didn't notice it wasn't really happening in the main ray loop. Solves some memory issues reported in T46880. |
November 28, 2015, 15:07 (GMT) |
Cycles: Fix missing indirect subsurface initialization in the bake code |
November 28, 2015, 14:35 (GMT) |
OpenGL: remove unnecessarily paranoid bound texture preservation. |
November 28, 2015, 14:35 (GMT) |
OpenGL: assume GL_TEXTURE_ENV_MODE GL_MODULATE is the default state. |
November 28, 2015, 14:35 (GMT) |
OpenGL: set OpenGL lights through simple shader API. |
November 28, 2015, 14:35 (GMT) |
OpenGL: update simple shader API. Restore fixed function lighting code for now and control use of GLSL shader with a variable, make light types more clear, reduce state changes, some other minor tweaks. |
November 28, 2015, 14:35 (GMT) |
OpenGL: rename GPU_enable_material to better indicate it's binding shaders. |
|
|
|


Master Commits
MiikaHweb | 2003-2021