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
2022-02-07Merge branch 'master' into KTX_supportKTX_supportAntonis Ryakiotakis
2022-02-07Curves: Rename "Hair" types, variables, and functions to "Curves"Hans Goudey
Based on discussions from T95355 and T94193, the plan is to use the name "Curves" to describe the data-block container for multiple curves. Eventually this will replace the existing "Curve" data-block. However, it will be a while before the curve data-block can be replaced so in order to distinguish the two curve types in the UI, "Hair Curves" will be used, but eventually changed back to "Curves". This patch renames "hair-related" files, functions, types, and variable names to this convention. A deep rename is preferred to keep code consistent and to avoid any "hair" terminology from leaking, since the new data-block is meant for all curve types, not just hair use cases. The downside of this naming is that the difference between "Curve" and "Curves" has become important. That was considered during design discussons and deemed acceptable, especially given the non-permanent nature of the somewhat common conflict. Some points of interest: - All DNA compatibility is lost, just like rBf59767ff9729. - I renamed `ID_HA` to `ID_CV` so there is no complete mismatch. - `hair_curves` is used where necessary to distinguish from the existing "curves" plural. - I didn't rename any of the cycles/rendering code function names, since that is also used by the old hair particle system. Differential Revision: https://developer.blender.org/D14007
2022-02-07Merge branch 'blender-v3.1-release'Jacques Lucke
2022-02-07Fix T95543: incorrect handling of implicit field inputs in uiJacques Lucke
2022-02-07Nodes: Dynamic node class for Map Range nodeCharlie Jolly
This patch makes it possible to set the UI color of a node's header bar and override the default from the node's typeinfo. Currently the color is taken from the `.nclass` member of the node's bNodeType->TypeInfo struct. This is created once when registering the node. The TypeInfo is used for both UI and non-UI functionality. Since the TypeInfo is shared, the header bar for the node can't be changed without changing all nodes of that type. The Map Range node is shown as a `Converter` or blue color by default. This patch allows this to be changed dynamically to `Vector` or purple. This is done by adding a `ui_class` callback to node typeinfo struct. Reviewed By: HooglyBoogly Differential Revision: https://developer.blender.org/D13936
2022-02-07VSE: Add filter method to strip transformDimitry Kaplin
Previously, nearest interpolation filter was used for preview, because it offered good performance and bilinear was used for rendering. This is not always desirable behavior, so filter method can now be chosen by user. Chosen method will be used for preview and for rendering. Reviewed By: ISS Differential Revision: https://developer.blender.org/D12807
2022-02-04Fix: Remove incorrect assert in mesh modifier evaluationHans Goudey
Since we have a node that sets a mesh's auto smooth angle (unfortunately, in retrospect), we generally can't assume at all that value is the same as whatever input mesh. Similar asserts were removed previously in 8216b759e9557c786. While the attempt at assertions to clarify assumptions is noble, this one doesn't make sense anymore. I found this while investigating T95479. Differential Revision: https://developer.blender.org/D14009
2022-02-04Cleanup: Remove unused "init" node tree flagHans Goudey
The value of this flag was set, but not used anywhere. Differential Revision: https://developer.blender.org/D13519
2022-02-04Fix: Remove incorrect assert in mesh modifier evaluationHans Goudey
Since we have a node that sets a mesh's auto smooth angle (unfortunately, in retrospect), we generally can't assume at all that value is the same as whatever input mesh. Similar asserts were removed previously in 8216b759e9557c786. While the attempt at assertions to clarify assumptions is noble, this one doesn't make sense anymore. I found this while investigating T95479. Differential Revision: https://developer.blender.org/D14009
2022-02-04Attributes: Infrastructure for generic 8-bit integer data typeHans Goudey
This commit adds infrastructure for 8 bit signed integer attributes. This can be useful given the discussion in T94193, where we want to store spline type, Bezier handle type, and other small enums as attributes. This is only exposed in the interface in the attribute lists, so it shouldn't be an option in geometry nodes, at least for now. I expect that this type won't be used directly very often, it should mostly be cast to an enum type. However, with support for 8 bit integers, it also makes sense to add things like mixing implementations for consistency. Differential Revision: https://developer.blender.org/D13721
2022-02-04Cleanup: Removed Object type specific 'make_local' callback.Bastien Montagne
This callback was only needed to allow specific handling of proxies, now that theses have been removed the generic `BKE_lib_id_make_local_generic` code works for objects as well.
2022-02-04Cleanup: remove unused LOG declarationSybren A. Stüvel
No functional changes.
2022-02-04Remove internal proxy code, and deprecate related DNA data.Bastien Montagne
Part of T91671. Not much else to say, this is mainly a massive deletion of code. Note that a few cleanups possible after this proxy removal were kept out of this commit to try to reduce a bit its size. Reviewed By: sergey, brecht Maniphest Tasks: T91671 Differential Revision: https://developer.blender.org/D13995
2022-02-04Cleanup: spelling in commentsCampbell Barton
Also update viewport comments.
2022-02-04Cleanup: Clang tidy, use bracesHans Goudey
Braces missed in b73d3b80fdcb72446
2022-02-03Cleanup: Add comment about unsed custom data typeHans Goudey
Since f59767ff97295404d, these hair layer types are unused. Since DNA compatibility was broken with any files that would contain them, the indices can be reused to avoid growing custom data's typemap.
2022-02-03Merge branch 'blender-v3.1-release'Bastien Montagne
2022-02-03Curves: Changes to the new curves data-blockHans Goudey
This patch refactors the "Hair" data-block, which will soon be renamed to "Curves". The larger change is switching from an array of `HairCurve` to find indices in the points array to simply storing an array of offsets. Using a single integer instead of two halves the amount of memory for that particular array. Besides that, there are some other changes in this patch: - Split the data-structure to a separate `CurveGeometry` DNA struct so it is usable for grease pencil too. - Update naming to be more aligned with newer code and the style guide. - Add direct access to some arrays in RNA -- Radius is now retrieved as a regular attribute in Cycles. -- `HairPoint` has been renamed to `CurvePoint` -- `HairCurve` has been renamed to `CurveSlice` - Add comments to the struct in DNA. The next steps are renaming `Hair` -> `Curves`, and adding support for other curve types: Bezier, Poly, and NURBS. Ref T95355 Differential Revision: https://developer.blender.org/D13987
2022-02-03Fix T95334: Crash with no vertex normals in multires bakeHans Goudey
This is partially caused by a stupid mistake in cfa53e0fbeed7178c78 where I missed initializing the `vert_normals` pointer in `MResolvePixelData`. It's also caused by questionable assumptions from DerivedMesh code that vertex normals would be valid. The fix used here is to create a temporary mesh with the data necessary to compute vertex normals, and ensure them here. This is used because normal calculation is only implemented for `Mesh` and edit mesh, not `DerivedMesh`. While this might not be great for performance, it's potentially aligned with future refactoring of this code to remove `DerivedMesh` completely. Since this is one of the last places the data structure is used, that would be a great improvement. Differential Revision: https://developer.blender.org/D13960
2022-02-03Fix (unreported) broken logic in proxy to liboverride conversion.Bastien Montagne
Iterating over scene's objects while we modify those (through proxy to override conversion code) is call for problems (use after free etc.). Instead, all proxy objects need to be gathered first in a temporary list, and processed all at once in a second loop.
2022-02-03Merge branch 'blender-v3.1-release'Jacques Lucke
2022-02-03Fix T94435: remove anonymous attributes when applying modifierJacques Lucke
Differential Revision: https://developer.blender.org/D13994
2022-02-03Merge branch 'blender-v3.1-release'Bastien Montagne
2022-02-03Fix (unreported) broken do_version of hidden layers from pre-2.8 files.Bastien Montagne
`BKE_collection_object_add` ensures given object is added to an editable collection, and not e.g. a linked or override one. However, some processes like do_version manipulate collections also from libraries, i.e. linked collections, in those cases we need a version of the code that unconditionnally adds the given object to the given colleciton.
2022-02-03Split Python OBJ importer and exporter, enabling only the importer.Howard Trickey
This is from patch D13988. It removes the "- New" from the menu of the new obj exporter, changes the default addon to just io_import_obj, and does the right versioning thing. Also disables the python tests for the old python exporter.
2022-02-03Merge branch 'blender-v3.1-release'Brecht Van Lommel
2022-02-03Fix T91254: Some editing operation indirectly delete objects from override ↵Bastien Montagne
collections. Those cases are fairly hard to track down... Added some more checks, also at lower levels, more generic levels of object editing, and fixed core check in liboverride (previously code was assuming that an override of a collection only could have overrides of objects or linked objects, but this is not necessarily true).
2022-02-03Split Python OBJ importer and exporter, enabling only the importer.Howard Trickey
This is from patch D13988. It removes the "- New" from the menu of the new obj exporter, changes the default addon to just io_import_obj, and does the right versioning thing. Also disables the python tests for the old python exporter.
2022-02-03Merge branch 'blender-v3.1-release'Campbell Barton
2022-02-03Fix T95137: Spline calc_length not working with just 1 NURB pointJesse Yurkovich
The NURB case did not properly handle a curve with only 1 point. Ref D13904
2022-02-03Merge branch 'blender-v3.1-release'Campbell Barton
2022-02-03Fix T66913: undo after frame-change doesn't refresh properlyCampbell Barton
Use the ID.recalc flag to detect when updates after frame-change is needed. Since comparing the last calculated frame doesn't take undo into account (see code-comment for details). `ID_RECALC_AUDIO_SEEK` has been renamed to `ID_RECALC_FRAME_CHANGE` since this is not only related to audio however internally this flag is still categorized in `NodeType::AUDIO`. Reviewed By: sergey Ref D13942
2022-02-03Merge branch 'blender-v3.1-release'Sergey Sharybin
2022-02-03Fix assert in original modifiers pointer update functionSergey Sharybin
The issue was happening with a specific file where the ID management code was not fully copying all modifiers because of the extra check in the `BKE_object_support_modifier_type_check()`. While it is arguable that copy-on-write should be a 1:1 copy there is no real need to maintain the per-modifier pointer to its original. Use its SessionUUID to perform lookup in the original datablock. Downside of this approach is that it is a linear lookup instead of direct pointer access, but the upside is that there is less pointers to manage and that the file with unsupported modifiers does behave correct without any asserts. Differential Revision: https://developer.blender.org/D13993
2022-02-02LibOverride: Move proxy conversion code in its own file.Bastien Montagne
This will allow to keep the access to deprecated DNA proxy data in that specific file, instead of allowing deprecated accesses in the whole override kernel code. Part of T91671.
2022-02-02Merge branch 'blender-v3.1-release'Bastien Montagne
2022-02-02Fix (unreported) bug in liboverride resync code.Bastien Montagne
Part of the resynching code would access collections' objects base cache, which can be invalid at that point (due to previous ID remapping and/or deletion). Use a custom recursive iterator over collections' objects instead, since those 'raw' data like collection's objects list, and collection's children lists, should always be valid. Found while investigating a studio production file.
2022-02-02Merge branch 'blender-v3.1-release'Sergey Sharybin
2022-02-02Fix T95288: Shrinkwrap selection broken in edit modeSergey Sharybin
Mistake in the 974981a63704: f the edit data is not present then the origindex codepath is to be used. Added a brief note about it on the top of the file. More ideally would be to remove edit mesh from non-bmesh-wrappers but this would require changes in the draw manager to make a proper decision about drawing edit mode overlays.
2022-02-02Remove option to not auto-convert proxies on file load.Bastien Montagne
Now all proxies will always be converted to library overrides. If conversion fails, they are simply 'disabled'. This should be the last 'user-visible' step of proxies removal. Remaining upcoming commits will remove internal ID management, depsgraph and evaluation code related to proxies. Also bump the blendfile subversion. Part of T91671.
2022-02-02Proxies Removal: Handle conversion to liboverrides also for linked data.Bastien Montagne
So far linked proxies were just kept as-is, this is no longer an option. Attempt to convert them into liboverrides as much as possible, though some cases won't be supported: - Appending proxies is broken since a long time, so conversion will fail here as well. - When linking data, some cases will fail to convert properly. in particular, if the linked proxy object is not instanced in a scene (e.g. when linking a collection containing a proxy as an epty-instanced collection instead of a view-layer-instanced collection). NOTE: converion when linking/appending is done unconditionnaly, option to not convert on file load will be removed in next commit anyway. Part of T91671.
2022-02-02LibOverride: Add 'owner library' info to some liboverride code.Bastien Montagne
This will help when dealing with liboverrides from other library files, e.g for resync or proxies conversion. This commit only affects proxy conversion. Part of T91671.
2022-02-02Cleanup: spelling in commentsCampbell Barton
2022-02-02Compositor: Combine and Separate XYZ NodeAaron Carlisle
We have this node for shader and geometry nodes. Compositor can also work with vectors, and this can help with that. Reviewed By: manzanilla Maniphest Tasks: T95385 Differential Revision: https://developer.blender.org/D12919
2022-02-02Cleanup: Use C++ typesHans Goudey
2022-02-01Merge branch 'blender-v3.1-release'Jacques Lucke
2022-02-01Fix T95262: instances ignored in Frame Selected operatorJacques Lucke
The issue was that the code only looked at `dob->ob` instead of `dob->ob_data` which is necessary since rB5a9a16334c573c4566dc9b2a314cf0d0ccdcb54f. This now uses the same pattern that is used in other places where `BKE_object_replace_data_on_shallow_copy` is used.
2022-02-01Merge branch 'blender-v3.1-release'Campbell Barton
2022-02-01Merge branch 'blender-v3.1-release'Campbell Barton
2022-02-01Fix T95185: Invalid normals after undo in sculpt modeCampbell Barton
Since d9c6ceb3b88b6db87490b08e0089f9a18e6c52d6 partial updates to normals in sculpt-mode were accumulating into the current normal instead of a zeroed value. Zero vertex normal values tagged for calculation before accumulation. Reviewed By: HooglyBoogly Ref D13975