Revision 5467064 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, hair_immediate_fixes, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths, viewport_experiments) November 28, 2014, 15:15 (GMT) |
Merge branch 'master' into viewport_experiments Conflicts: source/blender/editors/space_view3d/view3d_draw.c source/blender/gpu/GPU_buffers.h source/blender/gpu/intern/gpu_buffers.c |
Revision bd434b9 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, hair_immediate_fixes, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths, viewport_experiments) November 28, 2014, 15:10 (GMT) |
Revert "Hook up flags to request a specific sorting scheme from GPU buffer setup" This reverts commit 827ad6075dcf144025db7c4319e9954dcf45b26c. |
November 28, 2014, 14:52 (GMT) |
Cleanup: unused headers |
November 28, 2014, 14:15 (GMT) |
Delete GPU buffers if preference changes. |
November 28, 2014, 13:38 (GMT) |
Cleanup GPU: get rid of some extremely legacy draw code. Basically this commit gets rid of most of the derived mesh immediate mode drawing (cases such as subsurf excluded). Even when VBO is turned off in user preferences, we still use vertex arrays, which are very similar to VBOs but memory is client side. Vertex arrays are OpenGL 1.1 so compatibility is not an issue here. Reviewers: campbellbarton, sergey, jwilkins Differential Revision: https://developer.blender.org/D919 |
November 28, 2014, 13:29 (GMT) |
Material not set in edit derived meshes after last material modification commits. |
Revision 2222e18 by Lukas Toenne November 28, 2014, 13:21 (GMT) |
Removed deprecated code. |
Revision cbc6212 by Lukas Toenne November 28, 2014, 13:15 (GMT) |
Free strand edit memory after use. |
Revision b16db8e by Lukas Toenne November 28, 2014, 13:02 (GMT) |
Fix for verts-of-strand iterator: This requires a second pointer in addition to the edge, otherwise the last point is omitted. |
November 28, 2014, 12:00 (GMT) |
Fix for previous commit (forgot to update rev UID, sorry). |
November 28, 2014, 11:57 (GMT) |
Compile fixes for mingw64 Need to set flags to use c++11 features, or else the std::bind stuff isn't available |
November 28, 2014, 11:44 (GMT) |
Install_deps: switch to OSL 1.5.11 (ammended with blender-fixes). |
Revision cf2ec5b by Lukas Toenne November 28, 2014, 11:42 (GMT) |
CustomData layer for storing hair root locations as MSurfaceSamples. This requires converting the old messy particle num/num_dmcache/fuv/foffset data into the new mesh samples, which can potentially introduce floating point errors and inaccuracies due to lack of face index mapping in the new system. However, in any well-constructed particle system the hair roots should be nearest to their num face, so mapping would be accurate enough. If necessary face index data could be added to samples as a legacy code hack, but probably it's best to eventually replace the hair system as a whole anyway. |
November 28, 2014, 11:16 (GMT) |
Cycles: Only report exporting curves if there are particle systems on the object |
November 28, 2014, 10:51 (GMT) |
Cycles: Code cleanup, remove dead code |
Revision 7e9eb8b by Antonis Ryakiotakis (gooseberry, gooseberry_farm, hair_immediate_fixes, temp_constraint_volume, temp_hair_flow, temp_hair_modifiers, temp_motionpaths) November 28, 2014, 10:47 (GMT) |
Merge branch 'master' into gooseberry Conflicts: source/blender/blenloader/intern/versioning_270.c |
November 28, 2014, 10:42 (GMT) |
Depsgraph: Code cleanup, fix typos |
November 28, 2014, 10:41 (GMT) |
Fix graph editor rename button resetting focus when escaping from it. This is a copy of what the outliner does and seems to work. |
November 28, 2014, 10:18 (GMT) |
Merge branch 'master' into depsgraph_refactor |
Revision a270a9f by Lukas Toenne November 28, 2014, 09:42 (GMT) |
Store the hair key weight in edit mode. Currently particles only have a single weight value, controlling pinning in the simulation (for root and virtual root verts) and goal force scaling. This will be replaced by a full vertex group weight system eventually. |
|
|
|


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