Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-14Merge branch 'master' into gooseberrySergey Sharybin
Conflicts: build_files/scons/tools/Blender.py source/blender/blenkernel/intern/mesh.c source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/particle_system.c source/blender/editors/interface/interface_handlers.c
2015-05-14Merge branch 'alembic' into gooseberryLukas Tönne
Conflicts: source/blender/physics/intern/BPH_mass_spring.cpp
2015-05-14Fix for Drag force fields: was using inverted velocity.Lukas Tönne
2015-05-13Merge branch 'alembic' into gooseberryLukas Tönne
Conflicts: source/blender/physics/intern/BPH_mass_spring.cpp
2015-05-13Optional feature "Goal Deflect" to disable goal forces when hitting aLukas Tönne
deflector object.
2015-05-13Cleanup: reduce scope for win32, Linux varsCampbell Barton
2015-05-13UI: check visible layers when reading contextCampbell Barton
This resolves a problem where selected items edited for multi-value-editig could include objects not in any visible views (unlocked layers, local view... etc).
2015-05-13Multi-View: return correct number of views when rendering only one of the ↵Dalai Felinto
stereo pairs Without this fix ViewerNode would continously trash the views/buffer when disabling either stereo eye.
2015-05-13Fix T44684 Compositor backdrop isn't updating correctlyDalai Felinto
2015-05-12Cleanup: styleCampbell Barton
2015-05-12Dyntopo PBVH build optimization:Antony Riakiotakis
Optimize the full rebuild case for now (though same code can be adapted to partial redraws) Main changes here: * Calculate bounding centroid for faces only once (instead of every intermediate node) * Faces do not get added to GSets immediately, instead we track a face array which has faces that belong in a node in consecutive order. Nodes just keep accounting of start and length in the array. * Due to faces not being added to GSets, we can skip doing cleanup of GSets and readdition for each intermediate node and instead only add the faces to the final leafs node GSets when those nodes are created. Results: For a 1.9 million face test model, PBVH generation time (roughly measured by undoing) is dropped from 6 seconds to about 4 seconds. Still too high, but still a nice improvement. TODO: Thread some parts. Unfortunately threading the GSet assignment part might not help much since we'd need a lot of locking to avoid collisions with node assignments, especially for unique vertices.
2015-05-12Depsgraph: New dependency graph integration commitSergey Sharybin
This commit integrates the work done so far on the new dependency graph system, where goal was to replace legacy depsgraph with the new one, supporting loads of neat features like: - More granular dependency relation nature, which solves issues with fake cycles in the dependencies. - Move towards all-animatable, by better integration of drivers into the system. - Lay down some basis for upcoming copy-on-write, overrides and so on. The new system is living side-by-side with the previous one and disabled by default, so nothing will become suddenly broken. The way to enable new depsgraph is to pass `--new-depsgraph` command line argument. It's a bit early to consider the system production-ready, there are some TODOs and issues were discovered during the merge period, they'll be addressed ASAP. But it's important to merge, because it's the only way to attract artists to really start testing this system. There are number of assorted documents related on the design of the new system: * http://wiki.blender.org/index.php/User:Aligorith/GSoC2013_Depsgraph#Design_Documents * http://wiki.blender.org/index.php/User:Nazg-gul/DependencyGraph There are also some user-related information online: * http://code.blender.org/2015/02/blender-dependency-graph-branch-for-users/ * http://code.blender.org/2015/03/more-dependency-graph-tricks/ Kudos to everyone who was involved into the project: - Joshua "Aligorith" Leung -- design specification, initial code - Lukas "lukas_t" Toenne -- integrating code into blender, with further fixes - Sergey "Sergey" "Sharybin" -- some mocking around, trying to wrap up the project and so - Bassam "slikdigit" Kurdali -- stressing the new system, reporting all the issues and recording/writing documentation. - Everyone else who i forgot to mention here :)
2015-05-12Depsgraph: Add evaluation callbacks for granular nodes updateSergey Sharybin
This commit only adds callbacks which then later be used with major dependency graph commit, keeping the upcoming commit more clean to follow. Should be no functional changes so far still.
2015-05-12Depsgraph: Make ob_get_parent_matrix() more public and reusableSergey Sharybin
Currently still only used from object.c, but in the next commit it'll be also used from granular object update callbacks.
2015-05-12Depsgraph: Add utility function to check whether modifier depends on timeSergey Sharybin
Currently unused, based on the code from old depsgraph.c. The purpose is to re-sue the code over old and new depsgraph in an easy way.
2015-05-12Depsgraph: Add utility function to tag pose for recalcSergey Sharybin
Currently this function only tags pose itself, totally matching previous behavior. But this will be needed in the future once new dependency graph is landed, because of it's granular nature which relies on the fact that pose channels are all up to date when building the graph. Should be no functional changes so far.
2015-05-12Depsgraph: Move update-related functions into own filesSergey Sharybin
Currently it is just moving existing functions into a new file, but in the future those new files will be grown much more due to upcoming more granular scene updates. Should be no functional changes.
2015-05-12Merge branch 'alembic' into gooseberryLukas Tönne
Conflicts: source/blender/physics/intern/BPH_mass_spring.cpp
2015-05-11Fix for initialization of effector velocities.Lukas Tönne
2015-05-11Clearing preview image shall also unset 'user edited' flag!Bastien Montagne
2015-05-11Expose PreviewImage & custom icons to py API.Bastien Montagne
This commit mainly: * Exposes PreviewImage struct in RNA, including ways for user to set images data. * Adds a new kind of PreviewImage, using a file path and IMB_thumb to get image. * Adds a new kind of custom icon using PreviewImage, unrelated to ID previews system. * Adds a python API (utils.previews) to allow python scripts to access those custom previews/icons. Note that loading image from files' thumbnails is done when needed (deferred loading), not when defining the custom preview/icon. WARNING: for release addons who would want to use this, please keep it to a strict minimum, really needed level. We do not want our UI to explode under hundreds of different flashy icons! For more info, see also the release notes of Blender 2.75 (http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.75/Addons) and the example/templates featured with Blender. Patch by Campbell (ideasman42), Inês (brita) and Bastien (mont29). Differential Revision: https://developer.blender.org/D1255
2015-05-11Merge branch 'alembic' into gooseberryLukas Tönne
2015-05-11Fix for crash when using cache file paths without slashes in them.Lukas Tönne
2015-05-11Merge branch 'alembic' into gooseberryLukas Tönne
2015-05-11Fix for potential NULL pointer access when looking up strands data fromLukas Tönne
caches. The 'find' function was returning a bool value, but this does not guarantee non-null pointers. Removed the return value to avoid confusion, now callers should simply check the returned pointers.
2015-05-11Change of cache filter group behavior to allow partial caching.Lukas Tönne
The filter group was used by omitting any object instances that were not in the group. This reduces the cache size, but it also entirely skips objects. Now the filter group only prevents writing of the actual object data, but still allows storing dupli instances and dummy entries in the cache. Any objects from cached dupli lists that don't have cached data (mesh or strands) will now use the original object data instead.
2015-05-11Merge branch 'alembic' into gooseberryLukas Tönne
2015-05-11GHash: avoid redundant castsCampbell Barton
2015-05-10Fix T44633: image cache broken for movies and sequences.Brecht Van Lommel
After multiview, it was continuously unloading/loading image buffers from the cache due to mismatch in cache insert and lookup keys.
2015-05-10Drag type force field for keeping hairs "stuck" to a mesh surface.Lukas Tönne
2015-05-10Fix T44644 Missing thread-protection (spinlock) of image in new multiview code.Bastien Montagne
Many thanks to Sergey, for practically giving the solution! Note that it may also fix T44345, depends whether there are other missing protections/locks or not...
2015-05-08Merge branch 'alembic' into gooseberryLukas Tönne
2015-05-08Don't use the refkey for calculating shape deltas, but only for the baseLukas Tönne
shape. Shape keys distinguish between the base shape (shape without any keys) and the individual reference shapes for each shape key (which define the delta offsets). For strand shapes, which have to work on top of animation, the base shape must be the original cache result rather than a static shape, but the delta for each keyblock is still calculated wrt. an explicit shape.
2015-05-08Merge branch 'alembic' into gooseberryLukas Tönne
2015-05-08Merge branch 'master' into gooseberryAntony Riakiotakis
2015-05-08Handle transformation difference between a cached duplicator object andLukas Tönne
group objects when editing shape keys. The edit data (including CD_SHAPEKEY layers) is in the active object's space, i.e. the duplicator. The original data however is cached strands data, which is in the dupli object's space. All geometry data needs to be transformed properly when entering/exiting edit mode.
2015-05-08Merge branch 'master' into alembicLukas Tönne
2015-05-08Merge branch 'alembic' into gooseberryLukas Tönne
Conflicts: source/blender/physics/intern/BPH_mass_spring.cpp
2015-05-08Another curve mapping to control bending stiffness along hair strands.Lukas Tönne
This already exists for goal springs. Bending stiffness, however, is preferable to global goal springs for physical realism. Controlling stiffness in this way allows using bending forces to also simulate unconventional hair, such as clumpy strands that are thicker and stiffer at the base. Note that hair interaction can also be simulated with this tool in some way, although eventually better methods may be needed for such effects.
2015-05-08Cleanup: use r_* prefix for return argsCampbell Barton
2015-05-07Merge branch 'alembic' into gooseberryLukas Tönne
2015-05-07Fix for uninitialized values in strand children, leading to randomLukas Tönne
crashes.
2015-05-07Fix T44604 bad quality of rake with bezier curves.Antony Riakiotakis
We can calculate tangents analytically for bezier curves, so just make them awesome. New code uses forward differencing calculation for efficiency just like curve calculation. Picture before/after: http://www.pasteall.org/pic/87843
2015-05-07Merge branch 'alembic' into gooseberryCampbell Barton
2015-05-07Cleanup: quiet warningsCampbell Barton
2015-05-07Merge branch 'master' into alembicCampbell Barton
2015-05-07Merge branch 'master' into gooseberryCampbell Barton
2015-05-07Fix T44631: Custom Normal Data Transfer crash.Bastien Montagne
Own stupid mistake in rBcdabf7e3...
2015-05-07Extended RNA update for shape keys to trigger re-reading of dupli caches.Lukas Tönne
2015-05-07Fix T44611: 'make_links_data' modifiers would fail and crash with multires ↵Bastien Montagne
modifier. Since it was not ensuring dest has valid mdisp data matching new multires modifier subdiv level... Also, fixed a bug in `multires_subdivide()`, which would crash when trying to increase from level 0 (aka no subdiv) to > 1 (wrong check, trying to interpolate when it should not). And added a few sanity checks.