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
2021-01-20Cleanup: remove extra in trailing asteriskCampbell Barton
Comment blocks not conforming to convention.
2021-01-20Merge branch 'blender-v2.92-release'Campbell Barton
2021-01-20Merge branch 'blender-v2.92-release'Campbell Barton
2021-01-20Merge branch 'blender-v2.92-release'Campbell Barton
2021-01-20Merge branch 'blender-v2.92-release'Campbell Barton
2021-01-20CMake: add missing headersCampbell Barton
Resolves 'cmake_consistency_check' reports.
2021-01-20Cleanup: spelling & cleanup for cmake_consistency_checkCampbell Barton
Much more could be done here, some obvious corrections.
2021-01-20CMake: update checking utility to ignore nanovdb filesCampbell Barton
2021-01-20Cleanup: remove unused file SEQ_util.hCampbell Barton
Committed by accident when SEQ_utils.h was also created.
2021-01-20Cleanup: Store runtime space node variables in a separate structHans Goudey
This commit moves runtime-only variables from the `SpaceNode` DNA struct to a private struct in `node_intern.h`. Before, it was hard to tell which data needed to be saved in files, this should make it more clear. Node that the `edittree` field is basically a runtime variable, since it's set from the `treepath` list on read, but moving it would require some more invasive changes that I don't think are worth it right now. Also, not all of the moved variables were explicitly cleared on read-- `aspect` is set at the start of a redraw, `cursor` is set in a region callback, and `recalc` was used as an update flag. Differential Revision: https://developer.blender.org/D10141
2021-01-20Cleanup: Use const arguments, explicit typeHans Goudey
2021-01-19Merge branch 'blender-v2.92-release'Bastien Montagne
2021-01-19Refactor modifier copying code.Bastien Montagne
Things like pointers to particle systems, or softbody data being stored outside of its modifier, make it impossible for internal modifier copy data code to be self-contained currently. It requires extra processing. In existing code this was handled in several different places, in several ways, and alltogether fairly inconsistently. Some cases were even not properly handled, causing e.g. crashes as in T82945. This commit addresses those issues by: * Adding comments about the hackish/unsafe parts `psys` implies when copying some modifier data (since we need to ensure particle system copying and remapping of those pointers separately). * Adding as-best-as-possible handling of those cases to `BKE_object_copy_modifier` (note that it remains fragile, but is expected to behave 'good enough' in any practical usecase). * Remove special handling for specific editor code (`copy_or_reuse_particle_system`). This should never have been accepted in ED code area, and is now handled by `BKE_object_copy_modifier`. * Factorize copying of the whole modifier stack into new `BKE_object_modifier_stack_copy`, now used by both `object_copy_data` and `BKE_object_link_modifiers`. Note that this implies that `BKE_object_copy_modifier` and `BKE_object_copy_gpencil_modifier` are now to be used exclusively to copy single modifiers. Full modifier stack copy should always use `BKE_object_modifier_stack_copy` instead. Fix T82945: Crash when dragging modifiers in Outliner. Maniphest Tasks: T82945 Differential Revision: https://developer.blender.org/D10148
2021-01-19Refactor modifier copying code.Bastien Montagne
Things like pointers to particle systems, or softbody data being stored outside of its modifier, make it impossible for internal modifier copy data code to be self-contained currently. It requires extra processing. In existing code this was handled in several different places, in several ways, and alltogether fairly inconsistently. Some cases were even not properly handled, causing e.g. crashes as in T82945. This commit addresses those issues by: * Adding comments about the hackish/unsafe parts `psys` implies when copying some modifier data (since we need to ensure particle system copying and remapping of those pointers separately). * Adding as-best-as-possible handling of those cases to `BKE_object_copy_modifier` (note that it remains fragile, but is expected to behave 'good enough' in any practical usecase). * Remove special handling for specific editor code (`copy_or_reuse_particle_system`). This should never have been accepted in ED code area, and is now handled by `BKE_object_copy_modifier`. * Factorize copying of the whole modifier stack into new `BKE_object_modifier_stack_copy`, now used by both `object_copy_data` and `BKE_object_link_modifiers`. Note that this implies that `BKE_object_copy_modifier` and `BKE_object_copy_gpencil_modifier` are now to be used exclusively to copy single modifiers. Full modifier stack copy should always use `BKE_object_modifier_stack_copy` instead. Fix T82945: Crash when dragging modifiers in Outliner. Maniphest Tasks: T82945 Differential Revision: https://developer.blender.org/D10148
2021-01-19UI: Deselect other objects when dragging into 3D ViewJulian Eisel
When dragging an object into the 3D View, e.g. from the Outliner or the Asset Browser, other objects wouldn't get deselected. That differs from what other drop operations do, which create a new object. They deselect other objects in a lower-level function, which happens to not be called for just dropping objects. So I guess this is an oversight. Old behavior was also a bit annoying because users seem to expect this to deselect.
2021-01-19Merge branch 'blender-v2.92-release'Philipp Oeser
2021-01-19Fix T84784: Time Remapping not displaying in the timelinePhilipp Oeser
Caused by rBbbb2e0614fc3. Oversight to not take the remapped framelength into account. Maniphest Tasks: T84784 Differential Revision: https://developer.blender.org/D10134
2021-01-19Merge branch 'blender-v2.92-release'Philipp Oeser
2021-01-19Fix T84823: crash rendering with unconnected input socket in File Output nodePhilipp Oeser
Caused by rB957e292c5864. Now just skip unconnected sockets. Maniphest Tasks: T84823 Differential Revision: https://developer.blender.org/D10137
2021-01-19Merge remote-tracking branch 'origin/blender-v2.92-release'Dalai Felinto
2021-01-19Fix merge from 2.92 (subversion bump 292.14)Dalai Felinto
2021-01-19Object Info: Fix tooltip for the transform space optionDalai Felinto
This was agreed outside the patch discussion. And it did not make into the submitted code on 8b777ee6d69d4805c64756cf6a33db894160ce29.
2021-01-19Merge branch 'blender-v2.92-release'Sebastian Parborg
2021-01-19Volumes: fix calling BKE_volume_load from multiple threadsJacques Lucke
`BKE_volume_is_loaded` uses `grids.filepath` to determine if the grids are already loaded. The issue was that `grids.filepath` was set before the grids were loaded, resulting in incorrect early returns for other threads. Differential Revision: https://developer.blender.org/D10150
2021-01-19Geometry Nodes - Object Info: option to apply obj transform to the geometryDalai Felinto
By design the modified object transformations should still work and affect the geometry nodes results. The current behaviour, however, would make the geometry from the object info to not be affected by the modified object transformations. This patch changes that by default. In a similar fashion the Location, Rotation and Scale sockets outputs should be aware of whether the output should be in the global space or in the space of the nodetree. To solve this, the patch introduces a new transformation space "enum" where users can pick "Original" or "Relative" space. Original -------- Output the geometry relative to the input object transform, and the location, rotation and scale relative to the world origin. Relative -------- Bring the input object geometry, location, rotation and scale into the modified object maintaining the relative position between the two objects in the scene. Relative space violates a bit the design of the nodetree. The geometry in this case is transformed so that moving the modified object doesn't interfere with the geometry. This is particularly useful for the boolean node for instance. "Original" is the default space, but old files are set to "Relative" for backwards compatibility. Differential Revision: https://developer.blender.org/D10124
2021-01-19Geometry Nodes: pass depsgraph to nodes during executionJacques Lucke
The depsgraph will have to be accessed in an upcoming patch.
2021-01-19Merge branch 'blender-v2.92-release'Falk David
2021-01-19Fix T84642: Reassign effect-strip ignores animdataFalk David
When reassigning an effect strip to another sequence, any animation data in the effect strip will not be offset like expected. The fix calls `SEQ_offset_animdata` to offset the animation data after the seqence has been moved. Reviewed By: ISS Maniphest Tasks: T84642 Differential Revision: https://developer.blender.org/D10096
2021-01-19Merge branch 'blender-v2.92-release'Campbell Barton
2021-01-19Fix T84698: error adding movie clip tracksCampbell Barton
The movie clip's `region->v2d` was being resized by the view2d code, causing mouse cursor to movie-clip coordinate mapping to fail. This commit removes `UI_view2d_region_reinit`, matching the behavior for the image editor's 2D view. Reviewed By: sergey Ref D10106
2021-01-19Fix T74755: Cap of curve doesn't have smooth shadingCampbell Barton
Copy the smooth setting when filling in curve caps. For drawing this doesn't change behavior as a single normal is used for all faces. The difference may be noticed when converting to a mesh or with modifiers applied.
2021-01-19Merge branch 'blender-v2.92-release'Campbell Barton
2021-01-19Merge branch 'blender-v2.92-release'Campbell Barton
2021-01-19Fix T84041: Bevel caps have invalid normalsCampbell Barton
Bevel caps always had incorrect normals, causing display glitches in some cases. It seems this never worked properly (at least 2.79 also had this bug). Use the projection vector as the normal.
2021-01-19Fix T84568: UV loop selection marks edges sharpCampbell Barton
Regression in 6a10e69d270bc6866dd0000ffc0b81f6205ba2e9 (added when testing).
2021-01-19Merge branch 'blender-v2.92-release'Campbell Barton
2021-01-19Fix T84824: Incorrect height using interactive add toolFalk David
When using the interactive add tool for primitives with a fixed height and base aspect ratio, the height of the created primitive would be incorrect (two times too small or two times too big). When the base origin was centered, the `fixed_aspect_dimension` was not changed even though the base length was doubled. Additionally, when the height origin was centered but the height aspect ratio was fixed, the height was doubled leading to an incorrect size. The fix doubles `fixed_aspect_dimension` when the base origin is centered and correctly calculates the height of the primitive when the aspect ratio is set to fixed. Ref D10140
2021-01-19Cleanup: use 'const' argument for parameter argumentCampbell Barton
2021-01-19Merge branch 'blender-v2.92-release'Campbell Barton
2021-01-19Fix T66681: Blender 2.7x keymap inconsistenciesCampbell Barton
Match Blender 2.7x keymap more closely. - Image Editor: F3 for save image as. - Node Editor: Ctrl-LMB to cut links. - Cycle the falloff types instead of showing a pie-menu. - Use regular menu instead of pie menu for snapping.
2021-01-19UI Code Quality: Use "params" struct for area and region callbacksHans Goudey
These functions with many arguments can be unwieldy. Aside from the obvious issues with rewriting the list of arguments and the opportunities for error and frustration that presents, the long list of arguments make these systems hard to change. So when an argument should be added, someone might skip that and add some hack instead. So, as proposed in T73586#1037210, this patch instead uses a "params" struct for each of these callbacks. - Use param argument for `ARegionType.listener` - Remove unused window field in region listener - Use param argument for `SpaceType.listener` - Use params struct for `ARegionType.message_subscribe` Differential Revision: https://developer.blender.org/D9750
2021-01-18Cleanup: Clang tidy else after returnHans Goudey
2021-01-18Cleanup: Clang tidy else after returnHans Goudey
2021-01-18Merge branch 'blender-v2.92-release'Alexander Gavrilov
2021-01-18Armature: fix B-Bone deformation blending artifacts with Preserve Volume.Alexander Gavrilov
The double quaternion blending method in addition to the deformation matrix of each bone requires their rest matrices. For ordinary bones this literally should use the bone rest matrix without any ambiguity. However, it was also using the bone rest matrix for all of its B-Bone segments, which is incorrect and causes strange deformation in some cases involving extreme non-uniform scale, especially at boundaries between different B-Bones. There is also a similar known issue that happens with scale at bending joints, and this fix reduces the distortion when both bones are B-Bones. This changes both the Armature modifier and the Armature constraint to use the actual segment rest matrices. Unlike bones, these can have scale even in rest pose, so normalization is required. Differential Revision: https://developer.blender.org/D10003
2021-01-18Tracking: Implement tracks average operatorSergey Sharybin
Average selected tracks into the new one. This can be used to improve stability of tracking on blurry or non-very-sharp feature shapes. Averaging happens for all position, pattern corners and search area. Disabled markers do not take effect on averaging. Keyframed flag is copied from source. Gaps in the source tracks will be linearly interpolated, to reduce result track jump. Note that this only applies to gaps "inbetween". This means that if an input track doesn't have markers in the beginning/end of it, there is nothing to interpolate with and the result track will jump. Available from the Track panel, under the Merge category. Differential Revision: https://developer.blender.org/D6323
2021-01-18Tracking: Add interpolated accessor for markersSergey Sharybin
Allows to get marker position interpolated through out a gap. Currently unused, but is covered with test. Aimed to be used for track average operator.
2021-01-18Tracking: Re-write marker request functionSergey Sharybin
There are two main things. First, remove the marker index caching. Thins makes it possible to safely use function from a threaded environment. Second, replace linear search with binary search, which speeds up random lookup. There is no measurable difference in the stabilization which had a comment about caching nature of track lookup. The random lookup complexity changed from O(N) to O(log N). In practice this also unlikely to be measurable, but thread-safety worth it.
2021-01-18Fix T84719: Doversion for curve edit settingsFalk David
Make sure default values for curve edit mode are filled for older files. Reviewed By: antoniov Maniphest Tasks: T84719 Differential Revision: https://developer.blender.org/D10136
2021-01-18Fix T84719: Doversion for curve edit settingsFalk David
Make sure default values for curve edit mode are filled for older files. Reviewed By: antoniov Maniphest Tasks: T84719 Differential Revision: https://developer.blender.org/D10136