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
2017-01-31Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenkernel/intern/library_query.c
2017-01-31Cleanup: use 'cb_flag', not 'cd_flag' for library_query callbacks.Bastien Montagne
`cd_flag` tends to be used for CustomData flags in mesh area, while for library_query those are rather callback flags...
2017-01-31Cleanup: Rename callback flags from library_query to `IDWALK_CB_...`Bastien Montagne
Better to have clear way to tell whether flag is parameter for BKE_library_foreach_ID_link(), parameter for its callback function, or return value from this callback function.
2017-01-31Make 'make local' twice quicker.Bastien Montagne
Use new Main->relations ID usages mapping in BKE_library_make_local(). This allows a noticeable simplification in code, and can be up to twice quicker as previous code (Make Local: All from 2 to 1 minute e.g. in a huge production file with thousands of linked data-blocks). Note that new code has been successfuly tested with several complex cases (production files from Agent327), as well as some testcases from recent bug reports related to that function. But as always, nothing beats real usage by real users, so please check this before we release 2.79. ;) Main areas that would be affected: Make Local operations (L shortcut in 3DView), and append from libraries.
2017-01-31Optimization: pass Main to BKE_library_foreach_ID_link() and use its relations.Bastien Montagne
Use Main->relations in BKE_library_foreach_ID_link(), when possible (i.e. IDWALK_READONLY is set), and if the data is available of course. This is quite minor optimization, no sensible improvements are expected, but does not hurt either to avoid potentially tens of looping over e.g. objects constraints and modifiers, or heap of drivers...
2017-01-31Fix missing non-ID nodetrees in ID relationships built from library_query.cBastien Montagne
This shall fix both existing code (bpy mapping, and local/lib usages checks), and new Main->relations generation.
2017-01-31Add optional, free-after-use usages mapping of IDs to Main.Bastien Montagne
The new MainIDRelations stores two mappings, one from ID users to ID used, the other vice-versa. That data is assumed to be short-living runtime, code creating it is responsible to clear it asap. It will be much useful in places where we handle relations between IDs for a lot of them at once. Note: This commit is not fully functional, that is, the infamous, ugly, PoS non-ID nodetrees will not be handled correctly when building relations. Fix needed here is a bit noisy, so will be done in next own commit.
2017-01-22Merge branch 'master' into blender2.8Julian Eisel
Conflicts: source/blender/editors/space_action/action_draw.c
2017-01-20Cleanup/fix some BLI_string_utf8 not using size_t/off_t as expected.Bastien Montagne
2017-01-16Merge branch 'master' into blender2.8Bastien Montagne
2017-01-16Cleanup/refactor: Add new BLI_string_util.Bastien Montagne
Things like `BLI_uniquename` had nothing, but really nothing to do in BLI_path_util files! Also, got rid of length limitation in `BLI_uniquename_cb`, we can use alloca here to avoid overhead of malloc while keeping free size (within reasonable limits of course).
2017-01-02Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2017-01-01Fix T50305: When adding new ID with same name as existing, Blender could ↵Bastien Montagne
generate invalid utf-8 ID name. `check_for_dupid()` would roughly truncate existing name, without doing any utf-8 validation.
2016-12-28Revert particle system and point cache removal in blender2.8 branch.Lukas Tönne
This reverts commit 5aa19be91263a249ffae75573e3b32f24269d890 and b4a721af694817fa921b119df83d33ede7d7fed0. Due to postponement of particle system rewrite it was decided to put particle code back into the 2.8 branch for the time being.
2016-12-12Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/depsgraph.c source/blender/blenloader/intern/versioning_270.c source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_particle.c
2016-12-12Cleanup: Rename BKE_libblock_relink, and move it to BKE_library_remap.hBastien Montagne
Was a waaaaayyyyy to much generic name for such a specific func, renamed to much more descriptive BKE_libblock_relink_to_newid(). In near future (few weeks, to limit as much as possible silent mismatch in branches), will rename BKE_libblock_relink_ex to BKE_libblock_relink, this is the real generic data-block relinking func!
2016-12-01Merge branch 'master' into blender2.8Lukas Tönne
2016-11-30Cleanup id->newid usage, initial work.Bastien Montagne
This aims at always ensuring that ID.newid (and relevant LIB_TAG_NEW) stay in clean (i.e. cleared) state by default. To achieve this, instead of clearing after all id copy call (would be horribly noisy, and bad for performances), we try to completely remove the setting of id->newid by default when copying a new ID. This implies that areas actually needing that info (mainly, object editing area (make single user...) and make local area) have to ensure they set it themselves as needed. This is far from simple change, many complex code paths to consider, so will need some serious testing. :/
2016-11-16Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-11-15Avoid interface ID remapping when freeing the whole databaseSergey Sharybin
This makes heavy scenes to be freed almost instantly (so now quadbot scene takes only 0.06sec to free),
2016-11-13Fix T50013: Blender 2.78a Link/Append Crash.Bastien Montagne
Object freeing may in some kind access its obdata (in case it has some caches e.g.), since here obdata may have already been freed, let's set object's data pointer to NULL (probably not ideal solution, but we don't care much, those form archipelagos of unused linked datablocks, we nuke'em all anyway). Also fix stupid mistake in one of own recent commits (using ID we just freed, tsst...).
2016-11-12Fix renaming error in last commitCampbell Barton
2016-11-12BKE_library_make_local(): some minor improvements.Bastien Montagne
Do not set 'real user' to groups every time we run the first clearing loop. And do fully clear properly LIB_TAG_DOIT (this is not yet enforced in existing code, but would love to get to that stage in future, so let's do it at least with new code!).
2016-11-12Minor naming cleanup.Bastien Montagne
2016-11-12Enhance BKE_library_make_local() to make it much quicker in complex cases.Bastien Montagne
Basic idea is to split first loop in two, and run checks before making anything actually local, to detect data-blocks that we can directly make local (because we are sure they are only used by already/future local datablocks). This allows to avoid a lot of overhead in later 'cleanup' steps of this function, here with barbershop shot it's four times quicker (from 190s to 48s). We are still far from the instantaneous results of MakeLocal in 2.77, but in that version main characters lose their connection to their armature and remain static after makelocal, so guess new code is still better. ;) There are probably more optimizations possible here, but would rather polish this area of code once we get rid of proxies, those really make it a nightmare to work on.
2016-11-12Switch to unsafe but quick freeing of archipelagos of linked data.Bastien Montagne
This *should* work, but do not hesitate to revert in case it creates new crashes in append or makelocal processes.
2016-11-10Fix `BKE_library_make_local()` trying to also make local proxified objects.Bastien Montagne
Proxified objects can never be local, we can totally ignore them here. This 'fixes' the asserts related to usercount when trying to remap poselib of localized proxified objects (not sure what exactly was going on wrong here, but proxies are a giant can of worms for sane data-blocks handling anyway :/).
2016-11-09Fix some assert when making local (due to infamous PITA ShapeKey ID).Bastien Montagne
2016-11-09Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-11-08Depsgraph: Use atomics to tag ID when evaluating driverSergey Sharybin
This is required since new dependency graph evaluates drivers in threads so it was possible to have some partially written ID tag there.
2016-11-07Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/addon/properties.py
2016-11-03Fix T49903: Blender crashes -> Append Group incl. Object using boolean modifierBastien Montagne
New code dealing with getting rid of lib-only cycles of data-blocks could add several time the same datablock to the list of candidates. Now this is avoided, and pointers are further cleaned up as double-safety measure.
2016-11-02Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-11-01Fix T49856: Blender 2.78 crashes after loading data from a blendfileBastien Montagne
Issue here was that py API code was keeping references (pointers) to the liniked data-blocks, which can actually be duplicated and then deleted during the 'make local' process... Would have like to find a better way than passing optional GHash to get the oldid->newid mapping, but could not think of a better idea.
2016-10-21Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
Conflicts: source/blender/blenloader/intern/versioning_defaults.c
2016-10-19Fix T49775: Appending data with internal dependency cycles prevents correct ↵Bastien Montagne
clearing of linked data-blocks. This is not a simple fix, but imho still needs to be backported to 2.78a...
2016-10-18Fix: Append 'Object proxy' hack checking for local/linked usages before ↵Bastien Montagne
those flags were set! Dummy mistake, to be backported to 2.78a.
2016-10-17Fix T49722: Appending Bug (Groups).Bastien Montagne
One day we'll have to reconsider why some many 'real' ID usages are not refcounting... :( To be backported to 2.78a.
2016-10-13Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-10-13Prevent problems when appending scene with referenced proxySybren A. Stüvel
Such a "referenced proxy" could be a proxy that is used in a constraint on another object. Brings back part of 1cdc54dc7db85766 but without the memory leak.
2016-10-13Proxy appending: re-establish link to proxies when they are made localSybren A. Stüvel
This allows appending of an entire scene from another blend file into this one, even when that blend file contains proxified armatures. This replaces the approach from commit 1cdc54dc7db85766. Thanks @sergey for the help.
2016-10-07Merge branch 'master' into blender2.8Julian Eisel
2016-10-07Proxied → ProxifiedSybren A. Stüvel
2016-10-07Re-establish link to proxies when they are made local after appending.Sybren A. Stüvel
This allows appending of an entire scene from another blend file into this one, even when that blend file contains proxified armatures. Since the proxified object needs to be linked (not local), this will only work when the "Localize all" checkbox is disabled. The appended proxy object should also not be referenced from anything in a library (for example in a constraint). Referencing it from the appended data should be fine. Fixes T49495.
2016-08-10Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/particle.c
2016-08-08Fix ID types DAG update tagging.Kévin Dietrich
The first character of the ID type was used to tag IDs for updates which is weak since different IDs can have the same first character (for example meshes, materials and metaballs), causing unnecessary updates of unrelated IDs. Now we use a unique index per ID type to tag for updates, unifying IDs arrays indexing along the way. Reviewers: sergey, mont29 Differential Revision: https://developer.blender.org/D2139
2016-08-07Fix pretty stupid mistake in last 'append fix' commit (rB50c017b6eabd).Bastien Montagne
2016-08-06Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: release/scripts/startup/bl_ui/properties_particle.py release/scripts/startup/bl_ui/properties_physics_cloth.py release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py release/scripts/startup/bl_ui/properties_physics_softbody.py source/blender/blenkernel/BKE_library.h source/blender/blenkernel/BKE_particle.h source/blender/blenkernel/intern/cloth.c source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/library_query.c source/blender/blenkernel/intern/particle_system.c source/blender/blenkernel/intern/scene.c source/blender/blenkernel/intern/softbody.c source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/versioning_270.c source/blender/editors/space_file/filesel.c source/blender/editors/space_outliner/outliner_intern.h source/blender/makesdna/DNA_ID.h source/blender/makesdna/DNA_object_force.h source/blender/makesdna/DNA_particle_types.h source/blender/makesrna/intern/rna_particle.c source/blender/makesrna/intern/rna_sculpt_paint.c source/blender/makesrna/intern/rna_smoke.c source/blender/makesrna/intern/rna_space.c
2016-08-06Basic Alembic supportKévin Dietrich
All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-05Fix T49022: Crash in BKE_libblock_remap_locked.Bastien Montagne
Previous check to skip non-linkable IDs resulted in not clearing those skipped ID's newid member, wich lead to try to remap it later in code.