September 22, 2014, 21:10 (GMT) |
Merge remote-tracking branch 'origin/master' into multiview Conflicts: source/blender/render/intern/source/pipeline.c |
Revision 2788b38 by Lukas Toenne (gooseberry, gooseberry_farm, hair_immediate_fixes, hair_system, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths) September 22, 2014, 19:20 (GMT) |
Fix for missing initialization of local cloth modifier inside particle systems. |
September 22, 2014, 19:20 (GMT) |
Fix for sunbeams operation |
September 22, 2014, 18:12 (GMT) |
Merge remote-tracking branch 'blender-upstream/master' into blender-tiles |
September 22, 2014, 18:05 (GMT) |
Cleaned up some code - removed unneeded conversion to value buffer, the internal buffer now is a value buffer so no conversion needed. - removed ifdefs from deficus. the optimalization is not used for several years and no need to develop it any further |
Revision ee323fc by Lukas Toenne (gooseberry, gooseberry_farm, hair_immediate_fixes, hair_system, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths) September 22, 2014, 17:27 (GMT) |
Proper implementation of angular bending springs including jacobian derivatives for stabilization. The bending forces are based on a simplified torsion model where each neighboring point of a vertex creates a force toward a local goal. This can be extended later by defining the goals in a local curve frame, so that natural hair shapes other than perfectly straight hair are supported. Calculating the jacobians for the bending forces analytically proved quite difficult and doesn't work yet, so the fallback method for now is a straightforward finite difference method. This works very well and is not too costly. Even the original paper ("Artistic Simulation of Curly Hair") suggests this approach. |
Revision bf99607 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, hair_immediate_fixes, hair_system, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths, terrible_consequencer, testbuild) September 22, 2014, 13:29 (GMT) |
Gooseberry request, option to turn all waveform display on/off. |
September 22, 2014, 12:46 (GMT) |
loading flow data on first sim frame |
Revision c4b6d60 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, hair_immediate_fixes, hair_system, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths, viewport_experiments) September 22, 2014, 12:20 (GMT) |
Attempt to fix shader compilation in OSX. strict compilation does not allow dividing float by integer. |
September 22, 2014, 11:35 (GMT) |
scenario changed according to simpleplume |
September 22, 2014, 08:21 (GMT) |
Revert "Import D765 Blender input method editor support for windows (diff #8)." This reverts commit 980cebdb8a8cf0a311c14f9ba1f192b6e3741dd3. |
September 22, 2014, 07:31 (GMT) |
Import D765 Blender input method editor support for windows (diff #8). |
September 21, 2014, 14:37 (GMT) |
per-step sim without writing to disk, reducing number of arguments to manta |
September 21, 2014, 12:51 (GMT) |
low-res smoke scenario running, unused files removed |
September 21, 2014, 12:43 (GMT) |
updated mantaflow version |
September 21, 2014, 12:43 (GMT) |
reverting to old smoke style, simpleplume scenario for debug |
Revision f0fb58a by Lukas Toenne (gooseberry, gooseberry_farm, hair_immediate_fixes, hair_system, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths) September 21, 2014, 09:48 (GMT) |
Unused function declaration. |
Revision caf81de by Lukas Toenne (gooseberry, gooseberry_farm, hair_immediate_fixes, hair_system, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths) September 20, 2014, 19:05 (GMT) |
Basic solver result feedback from the mass-spring (cloth/hair) solver. This returns a general status (success/no-convergence/other) along with basic statistics (min/max/average) for the error value and the number of iterations. It allows some general estimation of the simulation quality and detection of critical settings that could become a problem. Better visualization and extended feedback can follow later. |
September 20, 2014, 16:47 (GMT) |
Fix individual images saving having color management applied to one views (caminandes bug) (and some code shuffling around) Note: the only part of save_image_doit that is not fully ok is when the user save a stereo encoded format (e.g., Anaglyph) and has the 'save as copy' option unchecked. Personally I think we shouldn't support this combination (user looses data this way), or we should re-load the image (which is not nice if the format is lossly like jpeg). |
September 20, 2014, 14:48 (GMT) |
using bake buton, reading more settings |
|
|
|


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