Revision e12f4a0 by Dalai Felinto January 21, 2015, 18:40 (GMT) |
Multiview: squashed |
Revision 6ea7901 by Dalai Felinto January 21, 2015, 18:39 (GMT) |
Merge remote-tracking branch 'origin/master' into experimental-build |
January 21, 2015, 18:29 (GMT) |
Sequencer Proxy: Images - add the view suffix only when view_id > 0 This way proxies created for monoscopic image strips created in previous Blenders work out of the box |
January 21, 2015, 18:29 (GMT) |
Sequencer Proxy: Image - Avoid creating unecessary proxy image files |
January 21, 2015, 18:29 (GMT) |
Sequencer Proxy: movies sequences in a working state, aka everything working Proxies in the Sequencer are fully working with Multiview. The code can be cleaned up a bit, but at least it's entirely functional. Note, for images we generate one proxy image per view (per frame), while for movies we generate one proxy movie per movie (so an anaglyph movie will generate only one proxy). Tested cases: * Image sequence - mono * Image sequence - 3d top-bottom encoded * Image sequence - 3d left-right pair * Movie sequence - mono * Movie sequence - 3d top-bottom encoded * Movie sequence - 3d left-right pair |
January 21, 2015, 18:29 (GMT) |
Small refactor using BKE_scene_view_id_suffix_get() |
January 21, 2015, 18:28 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview Conflicts: intern/cycles/blender/addon/ui.py source/blender/makesrna/intern/rna_space.c |
January 21, 2015, 17:43 (GMT) |
Cleanup of BGE code CcdPhysicsEnvironment::CallbackTriggers() Refactored some code to be easier to read. Semantically the code is identical. - Some conditions were negated to be able to return/continue early, rather than having the majority of the code inside an if-body. - Conditions were simplified (!(a == b)) turned into (a != b); repeated conditions calculated only once. - Unnecessary variables and one unnecessary condition were eliminated. Reviewers: campbellbarton, lordloki Reviewed By: lordloki Projects: #game_physics Differential Revision: https://developer.blender.org/D954 |
January 21, 2015, 14:53 (GMT) |
January 21, 2015, 13:09 (GMT) |
Fix: Joining armatures loses drivers Currently, when joining two armatures, the drivers of the armatures being merged in are lost. This commit introduces a new AnimData API function for merging animation data into another AnimData block. NOTE: * For now, this only copies the drivers over. As a result, manual effort will still be needed to go through and fix the drivers. I am working on automating that process, but it's more important that the drivers don't have to be created from scratch for now (since this is needed for the Goosberry rigging work). |
Revision 5662864 by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 21, 2015, 13:05 (GMT) |
Merge branch 'master' into gooseberry |
January 21, 2015, 13:00 (GMT) |
Added new debug flag which can be used to lazy-init the SimDebug drawing. A development addon can be used now to enable the debug drawing, without the need to add UI code for this in the release files. The SimDebug feature should also get an overall build flag and use function stubs unless enabled. That way any possibility of overhead in releases is eliminated. |
January 21, 2015, 12:19 (GMT) |
Fix limit check before accessing array in opennl Please note that opennl is already modified (for double precision) so re-integration is not really easy. Also, we'll eventually switch to Eigen. For until that let's just solve the condition in our bundled opennl. |
January 21, 2015, 12:15 (GMT) |
January 21, 2015, 11:59 (GMT) |
Depsgraph: WIP - Experimental fixes for regressions introduced So, it seems that using BONE_READY for constraint targets was breaking production rigs (notably the foot/leg setups), while using BONE_DONE will break the constrained-to-bone-in-same-ikchain setup... Just noting this here in case this comes in handy at some point. Perhaps we need to try something fancier using the rootmaps here? |
January 21, 2015, 11:03 (GMT) |
Depsgraph: WIP attempt to resolve some problems with IK chains This commit tried to fix the problems which occur when a bone that's part of an IK chain has a constraint to another bone in the same chain. Since all constraints are (or should still) handled before the IK solver runs, that ended up causing a deadlock, since the offending bone would rely on the "final" (done_node) transform of another bone in the same IK chain, which could only run after the IK solver runs - but that cannot run as it's waiting on this constrained bone. * Added a dedicated "BONE_READY" noop, which sits after the constraints op, before the done node, and before any link to an IK solver. This replaces all the calls to bone_final_transform() by having a dedicated node which can be queried for this purpose * Simplified the way that bone relationships get set up: The idea is that all bones in the same armature will use the "READY" nodes instead of "DONE" to avoid any lockups when dealing with IK. This way, we can do without all the common-root checks before doing parent links and so forth, as well as just setting out all the major relationships at the same time. (There is of course the risk that this breaks some old rigs (* see note below)) The result of all these efforts is that all the simple test cases and also the test file with the offending setup which inspired this fix all work now. However, it also seems to now be causing a range of weird regressions with production rigs (notably, strange new unstable popping in Koro and Victor Layout, as well as lag issues on some simpler IK leg rigs). |
Revision 0f26b5d by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 21, 2015, 09:38 (GMT) |
Removed the solver_index from cloth vertices. This was used as part of the "sim preview" feature, where some amount of vertices were tagged as disabled in the particle system. Due to the mind twisting complexity of using the nested cloth modifier to simulate hair strands indirectly it became necessary to still store all the vertices, but then disable them again on the solver level ... If this ever gets reimplemented it must be done in a sane way, avoiding the cloth step altogether. |
Revision 6681a6e by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 21, 2015, 09:13 (GMT) |
Merge branch 'master' into gooseberry Conflicts: source/blender/editors/space_view3d/view3d_draw.c source/blender/physics/intern/BPH_mass_spring.cpp source/blender/physics/intern/implicit_blender.c |
January 21, 2015, 09:07 (GMT) |
Removed generic debug1..4 values from the cloth data. These were used as UI buttons during development. If such parameters are needed again later they should instead be added in the (now global) SimDebugData and made accessible with a dev addon or so. |
January 21, 2015, 05:27 (GMT) |
UI: support alt+wheel for expanded enums |
|
|
|


Master Commits
MiikaHweb | 2003-2021