Revision 06aae67 by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 30, 2015, 10:31 (GMT) |
Added missing blenderplayer stubs for new particle edit shapekey functions used in RNA. |
Revision b3ca0e2 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 29, 2015, 18:35 (GMT) |
Merge branch 'master' into gooseberry |
Revision eee7918 by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 29, 2015, 16:00 (GMT) |
Disabled the child hair hull drawing feature. This is incompatible with particle data structures in their current form. Hull drawing requires sorting child particles based on the distance from their primary parent. However, this changes the order of children, which is the main method of generating random numbers for them. In the viewport this is not a problem, but when rendering the children are constantly recreated, using the respective deformed emitter mesh each time. This leads to changing child orders when using the convex hull sorting, and therefore different randomisation values. To properly implement child hull drawing we would have to generate a stable parent-child offset metric as well as avoiding any resorting in the actual data arrays. This in turn requires terribly inefficient drawing iteration, which could become a bottleneck by itself even before taking cache coherence or OpenGL optimization requirements into account (collecting child data into a dedicated buffer for drawing). |
Revision 76e7528 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 29, 2015, 13:40 (GMT) |
Comment out the proxy fix to test if it makes things better, |
Revision 46024a1 by Sergey Sharybin (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 29, 2015, 11:58 (GMT) |
Merge branch 'master' into gooseberry |
Revision 4f47a8b by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 29, 2015, 11:53 (GMT) |
Quick test to figure out performance bottleneck in gooseberry. Failed proxies will now attempt to fetch a smaller proxy first before fetching the full resolution. This might allow us to see if we are hitting a bandwidth issue (due to high res) or a file query issue (due to more file queries) |
Revision bb4a0a9 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 29, 2015, 11:42 (GMT) |
Merge branch 'master' into gooseberry |
Revision c602fad by Campbell Barton (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 29, 2015, 11:05 (GMT) |
Merge branch 'master' into gooseberry |
Revision 3482b33 by Campbell Barton (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 29, 2015, 03:16 (GMT) |
Wire-color was accidentally broken in a merge Adding back changes to background needed for auto-contrast. |
Revision 615330a by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 28, 2015, 17:13 (GMT) |
Support for the (still experimental) parent coloring mode in regular strand drawing. Parent coloring is currently still entirely random, but can be improved for all use-cases later. |
Revision b7abaf1 by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 28, 2015, 16:34 (GMT) |
Apply shape keys directly to the hair key data, instead of only applying to the hair dynamics input DM. Also this calculation has to happen before caching paths, otherwise there is a 1-update lag because parent paths still use old values. |
Revision d2219f8 by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 28, 2015, 15:18 (GMT) |
After editing hair, apply the changes back to the active hair shape key. This makes shape keys for hair actually usable by completing basic edit mode integration. |
Revision d045fd7 by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 28, 2015, 14:44 (GMT) |
Apply hair shape keys to the particle base data when entering edit mode and when switching the active key during edit mode. This is different from how shape key editing works on meshes: there the edit data (BMEditMesh) stores customdata layers for shape keys, then writes them back to the mesh. The hair edit mode is a lot more messy and confusing, it has to update the base data immeditately (with potential consequences for undo ...) |
Revision b2ca6a2 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 28, 2015, 14:34 (GMT) |
Merge branch 'master' into gooseberry |
Revision b52530f by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 28, 2015, 13:44 (GMT) |
Merge branch 'master' into gooseberry |
Revision 4ad69e1 by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 28, 2015, 13:38 (GMT) |
Initialize new hair shape keys with data from the current particle keys. |
Revision 307c766 by Sergey Sharybin (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 28, 2015, 12:33 (GMT) |
Merge branch 'master' into gooseberry |
Revision 6dc4664 by Antonis Ryakiotakis (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 28, 2015, 10:49 (GMT) |
Merge branch 'master' into gooseberry |
Revision 420d381 by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 28, 2015, 10:09 (GMT) |
Requiring COMPAT_ENGINES for particle panels is stupid. |
Revision d92f591 by Lukas Toenne (gooseberry, gooseberry_farm, temp_hair_modifiers, temp_motionpaths) January 27, 2015, 17:19 (GMT) |
Merge branch 'master' into gooseberry |
|