February 9, 2015, 13:09 (GMT) |
Reset function for the final hair state before calculating hair dynamics and paths. The integration with modifiers is still undefined: While it would be nicer to have regular modifiers work on hair state as well, it is probably not feasible with the current particle system, because all these steps happen in a single update function. For integrating with the modifier stack we would have to allow splitting this process into individual parts, which is just not possible. |
February 9, 2015, 13:09 (GMT) |
Added a second hair data layer to store modifier results. This imitates the DerivedMesh principle from meshes. For hair the modifiers will get the grooming or original growth result as input. The result of the modifier eval will be written to the new data layer, making a simple copy if modifiers are not used. Physics sim, rendering and (depending of settings) drawing will then use the modified grooming data. |
Revision 5186062 by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) February 9, 2015, 12:58 (GMT) |
Integration of particle shapekeys with the depsgraph and driver eval. It's a bit messy, but that is to be expected: all of the areas involved (particles, shapekeys, depsgraph, drivers) are badly designed and supposed to get major refactoring ... |
February 9, 2015, 11:14 (GMT) |
Cycles: Another attempt to solve 32bit CUDA kernel Previous fix didn't quite work well. For some reason everything worked fine when using native nvcc in 32bit environment, but cross-compiling from 64bit platform it was still running out of memory. For now just made it so all the kernels are slower on 32bit CUDA as a temporary solution. Either it'll be solved in next CUDA releases (by dropped 32bit? =) or we'll find better workaround. |
February 9, 2015, 11:10 (GMT) |
Fix ImBuf memory leak in Ptex |
February 9, 2015, 11:04 (GMT) |
Merge remote-tracking branch 'origin/master' into cycles-ptex-49 |
February 9, 2015, 11:02 (GMT) |
Fix ImBuf leaked by Image from View operator Running this operator and and closing Blender gives this: Error: Not freed memory blocks: 2 ImBuf_struct len: 2480 0x69ba4f8 imb_addrectImBuf len: 1048576 0x6ccc2d8 Fixed with added call to IMB_freeImBuf in BKE_image_add_from_imbuf. Could be fixed in the operator instead, but I think the BKE function is the correct place since the comment says it should take ownership of the ImBuf. Reviewers: sergey Reviewed By: sergey Differential Revision: https://developer.blender.org/D1084 |
Revision a8b00f6 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_motionpaths, temp_widgets_c++_experiment, temp_widgets_files_refactor, temp_widgets_update_tagging, UI-experiments, wiggly-widgets) February 9, 2015, 10:57 (GMT) |
Merge branch 'master' into wiggly-widgets Conflicts: source/blender/blenkernel/intern/customdata.c source/blender/makesdna/DNA_customdata_types.h |
February 9, 2015, 10:53 (GMT) |
Ptex+OSL compilation fix, change ifdef guard for older Ptex code |
February 9, 2015, 10:50 (GMT) |
Merge remote-tracking branch 'origin/master' into cycles-ptex-49 |
February 9, 2015, 10:28 (GMT) |
Code cleanup: remove unused function BKE_image_assign_ibuf Reviewers: sergey Reviewed By: sergey Differential Revision: https://developer.blender.org/D1083 |
February 9, 2015, 09:15 (GMT) |
Merge branch 'master' into asset-experiments |
February 9, 2015, 09:10 (GMT) |
SpaceFile: rework filelist_find, was looping way too much. |
Revision d5d4238 by Lukas Toenne February 9, 2015, 08:39 (GMT) |
Use the X mirror option in new strand edit stroke brush tools. Note that currently this has virtually no effect, because the mirror option relies on exact positions of vertices, which does not happen with random hair placement (the add brush has no mirror option yet). Eventually topological mirroring should help with this case, but is not implemented for either old or new strand edit yet. |
Revision b58db7c by Lukas Toenne February 9, 2015, 08:38 (GMT) |
Cleanup: rename function argument for consistency. |
February 9, 2015, 08:20 (GMT) |
Merge branch 'master' into asset-experiments |
February 9, 2015, 01:28 (GMT) |
Select new layer after importing a Ptex layer |
February 8, 2015, 23:48 (GMT) |
Set "*.ptx" filter glob for Ptex import operator |
February 8, 2015, 23:48 (GMT) |
GPencil: Show color swatches for GPencil layers in Outliner Instead of showing a meaningless "dot" icon or having to come up with an arbitrary icon, the Outliner now shows the stroke/fill color swatches for each layer to match every other place where these are shown. NOTE: Like many other widgets in the outliner though, these are not editable. |
February 8, 2015, 23:47 (GMT) |
GPencil: Viewport visbility and editability toggles for layers in Outliner * Viewport visibility and locking are currently exposed * Later on, visibility in renders can also be included |
|
|
|


Master Commits
MiikaHweb | 2003-2021