Commit Graph

150975 Commits

Author SHA1 Message Date
илья _
9fcb41de5e Cleanup: unused type alias in release build
`volume_grid_function_eval.cc(635,15): warning: unused type alias 'ValueType' [-Wunused-local-typedef]`

Pull Request: https://projects.blender.org/blender/blender/pulls/140497
2025-06-17 17:49:21 +02:00
Sergey Sharybin
6af1afa27f Merge branch 'blender-v4.5-release' 2025-06-17 17:36:02 +02:00
Sergey Sharybin
ab4c8853ee Make update: Automatically switch to git.blender.org URLs
Ref #140121

Pull Request: https://projects.blender.org/blender/blender/pulls/140538
2025-06-17 17:34:28 +02:00
Hans Goudey
06a37729a2 Cleanup: Resolve unused variable warning
Caused by bdbc2a9fd9
2025-06-17 11:15:16 -04:00
BaiGave-1
d74c23b3b4 IO: OBJ: Add material name collision import setting
Similar to the same setting in USD: default keeps current behavior
(each material in each import creates a new material in Blender),
"Reference Existing" choice uses already existing materials, when
their names match.

Co-authored-by: BaiGave <107305554+BaiGave@users.noreply.github.com>
Pull Request: https://projects.blender.org/blender/blender/pulls/140280
2025-06-17 17:03:58 +02:00
Philipp Oeser
bb2b286ab6 Merge branch 'blender-v4.5-release' 2025-06-17 16:31:55 +02:00
Philipp Oeser
adcea77c49 Fix #140257: Asset Browser Frame Selected wrong after a search
Also true (and reported) for the general File Browser.

In the implementation from 5a67407d5a it was noted that including the
active file was desirable(next to `FileSelection` `first` and `last` of
course).

`FileSelection` indices get correctly updated after search is altered/
cleared (by `file_current_selection_range_get`), the `FileSelectParams`
`active_file` however isnt.

This makes the framing go wrong when search is altered or cleared (it
uses an index from the previous/outdated filter result).
I case of the Asset Browser (in main) this was also obvious when you
looked at an active asset in the sidebar -> clearing a search (after
having selected something while searching) for example would make a
"completely different" asset active.

Since keeping track of a "previous" `active_file` (and trying to update
to an updated/correct index) turned out to be quite hairy, this PR goes
the route of actually clearing the `active_file` on search updates. Like
mentioned, this is still not ideal (at least for the Asset Browser, it
looses the "active" of something selected), but at least now you can
easily frame it again -- and is is better than in main (where "active"
would point to something completely unrelated and you could not even
frame it to click-activate it again).

Pull Request: https://projects.blender.org/blender/blender/pulls/140365
2025-06-17 16:31:40 +02:00
Ethan Mulwee
bdbc2a9fd9 UI: Properly disable the Remove Material Slot Button in edit mode
Currently the remove material slot button still appears to be
active while in edit mode. Attempting to use the button will
result in an error "Unable to remove material slot in edit mode."

Solution is to edit poll function to disable/gray out the remove
material slot button while in edit mode similar to other buttons

In the code a check was added for edit mode for the operator
execution as a fix for bug #21822. However this check was never added
to the polling function. This commit adds that check.

Pull Request: https://projects.blender.org/blender/blender/pulls/139660
2025-06-17 16:26:42 +02:00
Hans Goudey
54c3c8f411 Draw: Inline small functions to reduce overhead
Some functions used at least once per object/instance
when drawing are so trivial that function call overhead
becomes significant. Allowing these functions to be
inlined can remove that overhead and also give the
compiler more information it can use for optimization.

In the Erindale Flower Shop file, this change gives me
a 10% improvement in playback FPS, from 8.77 to 9.65.

Pull Request: https://projects.blender.org/blender/blender/pulls/140402
2025-06-17 16:06:05 +02:00
Jeroen Bakker
1d90d9f3bb Cleanup: Make format 2025-06-17 15:45:27 +02:00
Alaska
b561c78f93 Nodes: Remove legacy combine/separate nodes
In Blender 3.3 (1) the individual combine and separate color nodes were
combined together into a single combine/separate color node.

To ensure legacy addons still worked, the old nodes were left in
Blender, but hidden from the Add menus.

It has been nearly 3 years since that change was made, most if not all
addons should have been updated by now. So this commit removes these
hidden legacy nodes.

(1) blender/blender@82df48227b

Pull Request: https://projects.blender.org/blender/blender/pulls/135376
2025-06-17 15:36:33 +02:00
Brecht Van Lommel
ff8658b457 Merge branch 'blender-v4.5-release' 2025-06-17 14:17:06 +02:00
Brecht Van Lommel
5b1126da66 Fix #140375: Image editor save overwrites movie file
Create a good default name for saving individual frames of a movie file loaded
as an image datablock, instead of the movie file name.

Changes ImBuf to store the frame separate from the filepath, to implement this.
Seems more clear for ImBuf.filepath to be an actual filepath anyway.

Thanks to Jesse and Aras for investigating this bug.

Pull Request: https://projects.blender.org/blender/blender/pulls/140471
2025-06-17 14:15:19 +02:00
Bastien Montagne
4074d1d80b Cleanup: better naming for array length variables in rna_raw_access.
Extracted from PR !115967. Committed separately because otherwise, the
change in logic in that PR is lost in the renaming noise.

This commit is purely non-functional change.
2025-06-17 14:12:37 +02:00
Philipp Oeser
6e2f4f4cd7 Merge branch 'blender-v4.5-release' 2025-06-17 13:58:30 +02:00
Philipp Oeser
3b6075e7c6 Fix: Graph Editor box select menu entries
Currently we have two entries in the Select menu:
- Box Select
- Box Select (Include Handles)

But since b037ba2665, Include Handles is the default, so both entries
behave exactly the same.

To resolve, make it:
- Box Select (Include Handles)
- Box Select

with the second one setting the "include_handles" option to False.

NOTE: behavior of "include_handles" option False might be a bit flaky in
certain situations as well (can be checked later), better to actually
have two entries that represent what the code does.

Noticed while checking on #139314

Pull Request: https://projects.blender.org/blender/blender/pulls/139347
2025-06-17 13:58:13 +02:00
Omar Emara
811c513d90 Compositor: Remove Map Value node
This patch removes the Map Value node that was deprecated in 4.5 and was
planned for removal in 5.0. The common Shading Map Range node should be
used instead.

Pull Request: https://projects.blender.org/blender/blender/pulls/140533
2025-06-17 13:50:17 +02:00
Campbell Barton
c29c7d2eae Cleanup: remove unused functions 2025-06-17 21:24:58 +10:00
Julien Duroure
1579d20c0b Merge branch 'blender-v4.5-release' 2025-06-17 13:06:48 +02:00
Julien Duroure
550b3e8088 glTF exporter: Fix typo 2025-06-17 13:05:19 +02:00
Julien Duroure
d945abdc25 Merge branch 'blender-v4.5-release' 2025-06-17 12:59:44 +02:00
Julien Duroure
febe562f01 glTF importer: Refactoring merge material slots:
- Fixes some bugs with Variant import
- Fixes some bugs for no material but VC
- Add optino to choose to merge or not
2025-06-17 12:58:02 +02:00
Julien Duroure
81cfc41d36 Merge branch 'blender-v4.5-release' 2025-06-17 12:52:34 +02:00
Julien Duroure
4aa36b11d0 glTF exporter: Animation NLA track mode - fix export for SK & KHR_animation_pointer 2025-06-17 12:51:26 +02:00
Julien Duroure
6f3d61dc96 Merge branch 'blender-v4.5-release' 2025-06-17 12:47:26 +02:00
Julien Duroure
0bd1fbc731 glTF exporter: Variant: Sanity checks to avoid bad duplicate exports 2025-06-17 12:46:34 +02:00
Clément Foucault
cb6901f287 Fix: EEVEE: Wrong logic for shader parallel compilation
The previous logic was not triggering parallel compilation
for DoF and Fast GI shaders. This led to slower initialization
time for the default shader preview or render.
2025-06-17 12:43:50 +02:00
Julien Duroure
7d51edba4b Merge branch 'blender-v4.5-release' 2025-06-17 12:39:54 +02:00
Julien Duroure
6a684cf4f8 glTF exporter: avoid crash for big WebP images 2025-06-17 12:38:39 +02:00
Julien Duroure
e1a66cf64e Merge branch 'blender-v4.5-release' 2025-06-17 12:35:21 +02:00
Julien Duroure
d00e01e663 glTF: Fix missing unregister 2025-06-17 12:34:10 +02:00
Julien Duroure
edfa5531fc Merge branch 'blender-v4.5-release' 2025-06-17 12:31:22 +02:00
Julien Duroure
d4aa04d442 glTF: Fix action/inactive UI for export options 2025-06-17 12:30:12 +02:00
Jeroen Bakker
e7a8ed0eab GPU: Fix testcase due to recent cleanups
Issue was introduced by !140340. This test has 2 different array sizes
and used the parameter for its range.
2025-06-17 12:28:04 +02:00
Julien Duroure
966c41011e Merge branch 'blender-v4.5-release' 2025-06-17 12:25:52 +02:00
Julien Duroure
f9b3baa984 glTF exporter: Take (new) light temperature into account 2025-06-17 12:24:38 +02:00
Julien Duroure
f693f0d803 Merge branch 'blender-v4.5-release' 2025-06-17 12:20:23 +02:00
Julien Duroure
0f01a17004 glTF exporter: Take (new) light exposure into account 2025-06-17 12:18:48 +02:00
Julien Duroure
71275fc218 glTF exporter: Take (new) light exposure into account 2025-06-17 12:16:23 +02:00
Omar Emara
3ba4d8f58d Compositor: Remove Vector Curves node
This patch removes the Vector Curves node that was deprecated in 4.5 and
was planned for removal in 5.0. The common Shading Vector Curves node
should be used instead.

Pull Request: https://projects.blender.org/blender/blender/pulls/140529
2025-06-17 12:14:39 +02:00
Julien Duroure
44ba61dcbb Merge branch 'blender-v4.5-release' 2025-06-17 12:11:37 +02:00
Julien Duroure
41f1df2ad5 glTF exporter: Fix Variants export when Apply modifiers
Was a regression in 4.4
2025-06-17 12:10:12 +02:00
Pratik Borhade
4bf1931fee Fix #139494: Regression: Filtering doesn't work with custom search prop
If block added in 52b8eba9eb actually
seems reduandant (invert still shows all elements for empty string).
Due to the `filter_byname` condition, custom property used for search
filtering was useless as UI_list_item_index_is_filtered_visible returned
true for all elements.

Pull Request: https://projects.blender.org/blender/blender/pulls/139518
2025-06-17 12:05:55 +02:00
Philipp Oeser
7f1a1cb68e Merge branch 'blender-v4.5-release' 2025-06-17 12:05:48 +02:00
Philipp Oeser
3ddd2dff37 Fix #140210: Edit Bone selection cycling wrong for active but unselected
Unlike object or posemode (where items not only need to be active but
also selected to be treated as a starting point for cycling through to
the next item behind it on the next click), armature editmode would
treat active (but unselected) bones as a starting point as well. Leading
to confusion if you just clear your selection prior.

For reference to the expected behavior, look at these comments in
`mouse_select_eval_buffer`

>/* Only exclude active object when it is selected. */

>/* When the active object is unselected or not in `buffer`, use the
nearest. */

Now for editbones, the way `get_nearest_editbonepoint` works, there were
actually two things preventing stuff from happening as expected:
- [1] we would still get "use_cycle" behavior if we have an unselected
(active) bone -> this is now checked for by looking at active bone
selection flags (NOTE: tip/root needs to be looked at as well). These
checks were once there, bd59781c66 removed them though.
- [2] without "use_cycle" behavior, we are still looping all hit bones
and there could be the situation where we could accept a first bone (in
the `bias > bias_max` condition -- that one could be the closest already
but does not set the `min_depth`), but continue to loop (now entering
the "bias == bias_max && do_nearest" condition and `min_depth` could
still be at INT_MAX) and accept a bone that is actually further away...
That logic is from 328ec2b172

Both points have now been addressed.

Pull Request: https://projects.blender.org/blender/blender/pulls/140348
2025-06-17 12:05:19 +02:00
Julien Duroure
7cce4d171f Merge branch 'blender-v4.5-release' 2025-06-17 12:02:41 +02:00
Julien Duroure
064d3a5730 glTF importer: Fix importing some file
Where special nvode creation is mandatory.
2025-06-17 12:00:31 +02:00
Clément Foucault
10567d351c Fix: EEVEE: Broken versionning
This was making the tests fail.
`gtao_distance` still needs correct versionning
even if deprecated. Also `fast_gi_distance` does
not correspond to `gtao_distance`.
2025-06-17 11:30:01 +02:00
Jeroen Bakker
8b9bdf8236 Merge branch 'blender-v4.5-release' 2025-06-17 11:17:40 +02:00
Jeroen Bakker
ea1652dca3 Fix #140229: Vulkan: Crash during depth aware-navigation
Depth navigation sends many small render graphs to the device. It can be
that a subsequent render graph uses the same shader as the previous one
with the same descriptor set tracker. The descriptor set tracker didn't
cleared its full state and a subsequent render graph was generating
commands assuming that the device was in a certain state.

However it wasn't and a command to bind a descriptor set was skipped
resulting in a device out of bound write. Depending on the platform this
could overwrite any data on the GPU, including shader programs as the
select shader writes to a storage buffer. This clarifies why the issue
resulted in very odd and none consistent behavior.

This PR fixes this by clearing the VKPipelineData and
VKDescriptorTracker.

Pull Request: https://projects.blender.org/blender/blender/pulls/140526
2025-06-17 11:17:03 +02:00