Commit Graph

117289 Commits

Author SHA1 Message Date
Jacques Lucke
bda4c8a220 Tools: improve error handling in GDB pretty printers 2024-08-15 13:40:05 +02:00
Christoph Lendenfeld
0a4b5d93c5 Fix #126125: Pose Slider not working with layered actions
The issues was that the `get_item_transform_flags` iterated over the `curves`
list of the action, ignoring the new structure.

Fixed by using the `action_foreach_fcurve` and modifying that to work on legacy actions as well.

Pull Request: https://projects.blender.org/blender/blender/pulls/126357
2024-08-15 13:35:28 +02:00
Campbell Barton
da94978cc4 Cleanup: format 2024-08-15 21:26:12 +10:00
Campbell Barton
b5e0b59736 Cleanup: remove space around identifiers in C-style comments 2024-08-15 20:46:00 +10:00
Jacques Lucke
a8667aa03f Core: introduce MemoryCounter API
We often have the situation where it would be good if we could easily estimate
the memory usage of some value (e.g. a mesh, or volume). Examples of where we
ran into this in the past:
* Undo step size.
* Caching of volume grids.
* Caching of loaded geometries for import geometry nodes.

Generally, most caching systems would benefit from the ability to know how much
memory they currently use to make better decisions about which data to free and
when. The goal of this patch is to introduce a simple general API to count the
memory usage that is independent of any specific caching system. I'm doing this
to "fix" the chicken and egg problem that caches need to know the memory usage,
but we don't really need to count the memory usage without using it for caches.
Implementing caching and memory counting at the same time make both harder than
implementing them one after another.

The main difficulty with counting memory usage is that some memory may be shared
using implicit sharing. We want to avoid double counting such memory. How
exactly shared memory is treated depends a bit on the use case, so no specific
assumptions are made about that in the API. The gathered memory usage is not
expected to be exact. It's expected to be a decent approximation. It's neither a
lower nor an upper bound unless specified by some specific type. Cache systems
generally build on top of heuristics to decide when to free what anyway.

There are two sides to this API:
1. Get the amount of memory used by one or more values. This side is used by
   caching systems and/or systems that want to present the used memory to the
   user.
2. Tell the caller how much memory is used. This side is used by all kinds of
   types that can report their memory usage such as meshes.

```cpp
/* Get how much memory is used by two meshes together. */
MemoryCounter memory;
mesh_a->count_memory(memory);
mesh_b->count_memory(memory);
int64_t bytes_used = memory.counted_bytes();

/* Tell the caller how much memory is used. */
void Mesh::count_memory(blender::MemoryCounter &memory) const
{
  memory.add_shared(this->runtime->face_offsets_sharing_info,
                    this->face_offsets().size_in_bytes());

  /* Forward memory counting to lower level types. This should be fairly common. */
  CustomData_count_memory(this->vert_data, this->verts_num, memory);
}

void CustomData_count_memory(const CustomData &data,
                             const int totelem,
                             blender::MemoryCounter &memory)
{
  for (const CustomDataLayer &layer : Span{data.layers, data.totlayer}) {
    memory.add_shared(layer.sharing_info, [&](blender::MemoryCounter &shared_memory) {
      /* Not quite correct for all types, but this is only a rough approximation anyway. */
      const int64_t elem_size = CustomData_get_elem_size(&layer);
      shared_memory.add(totelem * elem_size);
    });
  }
}
```

Pull Request: https://projects.blender.org/blender/blender/pulls/126295
2024-08-15 10:54:21 +02:00
Sean Kim
f0c2d4eeed Cleanup: Add int8_t specifier to ED_grease_pencil.hh enum classes
Since these enums won't have more than 255 values, add the `int8_t` specifier.

Pull Request: https://projects.blender.org/blender/blender/pulls/126326
2024-08-15 10:15:06 +02:00
Christoph Lendenfeld
0f5dd1c55c Refactor: pose_utils.cc
No functional changes expected.

This PR refactors the code by:
* passing things by reference if they cannot be a `nullptr`
* Managing indentation by returning early or continuing.
* Cleaning up comments
* Indicating ListBase element types in the declaration

This is in service of #126125 for which the `get_item_transform_flags`
needs to be passed a slot handle as well.

Pull Request: https://projects.blender.org/blender/blender/pulls/126291
2024-08-15 09:47:14 +02:00
Jeroen Bakker
00be586a82 Fix #124565: EEVEE Environment Render Pass
There were a couple of regressions when using the environment render
pass.

- Not working when film transparency was enabled
- Deferred geometry didn't occlude the background

This PR splits the world background shader (eevee_surf_world) into two
shaders. One clears background and render passes and a second one that renders
the background and the environment render pass.

The second shader is moved after the deferred pipeline and an early
depth test is used to occlude the background and environment pass.

NOTE: render test reference images needs to be updated.
Pull Request: https://projects.blender.org/blender/blender/pulls/126274
2024-08-15 08:58:41 +02:00
Jeroen Bakker
925753c83b Fix #125618: EEVEE: Cryptomatte Material Layer Incorrect
Missing oversight in previous fix where incorrect name size where
used to generate the cryptomatte hash.

Pull Request: https://projects.blender.org/blender/blender/pulls/126352
2024-08-15 08:41:12 +02:00
Campbell Barton
9e09351b5b Fix active theme behavior when adding/removing themes
Regression in [0] which displays the filename for the active
theme but still used the label internally.

This meant actions such as removing the theme would not always apply
to the name being displayed.

- Adding a new theme was not setting it active.
- Detecting if a theme was built-in used the run-time label as a lookup.
- Theme removal first require it to be re-selected.

[0]: 0bb6317035
2024-08-15 16:06:13 +10:00
Hans Goudey
6ca352a7b6 Refactor: Sculpt: Remove mesh pointer from BVH tree, pass to drawing code
Part of #118145.
Similar in concept to recent commits removing the usage of
this mesh pointer in favor of fetching the data as necessary.
Also see recent discussion in a recent fix for this area:
https://projects.blender.org/blender/blender/pulls/122850.

And also note the comment for `Tree::mesh_` was incorrect.
The mesh was the original mesh, not the evaluated mesh.
2024-08-15 00:24:12 -04:00
Hans Goudey
b7cbe4d959 Refactor: Sculpt: Pass object instead of SculptSession to vertex access
Part of #118145.
This makes it possible to remove the vertex position array from
the sculpt BVH tree.
2024-08-15 00:17:44 -04:00
Hans Goudey
ae8ecd6e4e Cleanup: Remove unused variables 2024-08-15 00:00:44 -04:00
Hans Goudey
0c0a9d7714 Cleanup: Remove unused variables 2024-08-14 23:58:07 -04:00
Hans Goudey
9a776830a6 Refactor: Sculpt: Reduce usage of BVH tree positions array
In preparation for removing the positions array from the BVH tree
and just retrieving the evaluated or original positions as necessary.
2024-08-14 23:27:20 -04:00
Hans Goudey
bd19212fb8 Refactor: Sculpt: Avoid BVH tree geometry pointers in normals update
Part of #118145.
There is some complexity in this area because the normals need to be
updated on the original geometry only when there is no deformation
or multires modifier. The simplest way to encapsulate that usage of
the original geometry for now was adding a separate function that
contains the lookup with a comment justifying it.
2024-08-14 23:19:39 -04:00
Hans Goudey
0abf1b32b2 Refactor: Sculpt: Specialize face set fair selection filtering
Part of #118145.
2024-08-14 23:19:39 -04:00
Hans Goudey
561d035da4 Cleanup: Follow class layout style guide for SculptSession 2024-08-14 23:19:39 -04:00
Sean Kim
a0e6e16da5 Refactor: Various changes to SCULPT_OT_mask_by_color
* Removes usage of `PBVHVertRef` in favor of `int` since the operator
  only works on Mesh
* Removes calls to Multires and BMesh code that have no effect
* Inline floodfill algorithm

Pull Request: https://projects.blender.org/blender/blender/pulls/126258
2024-08-15 04:52:12 +02:00
Sean Kim
712d322335 Refactor: Sculpt: Add automask factor raw pointer overload
The automask cache is not guaranteed to exist for a given tool type,
instead of forcing developers to remember to guard the dereference with
a null check, this commit adds an inline overload that performs the
check for the user on a raw pointer. The API takes in pointers instead
of smart pointers as this method is not intended to take ownership of
the pointer into consideration.

Pull Request: https://projects.blender.org/blender/blender/pulls/126346
2024-08-15 04:47:24 +02:00
Hans Goudey
73e1fa181e Cleanup: Formatting 2024-08-14 21:10:04 -04:00
Hans Goudey
6703927a05 Refactor: Sculpt: Retrieve positions instead of using BVH tree reference
Part of #118145.
2024-08-14 21:10:04 -04:00
Sean Kim
a3a0a848a8 Fix #126330: Crash when using Color Filter
Pull Request: https://projects.blender.org/blender/blender/pulls/126332
2024-08-15 01:33:48 +02:00
Richard Antalik
717b8c08f3 Fix #125401: Crash when enabling prefetching
Prefetching thread attempted to render scene strip inside of meta strip,
because `channels` argument was incorrectly set to top-level channels.

Pull Request: https://projects.blender.org/blender/blender/pulls/126092
2024-08-14 22:36:11 +02:00
Hans Goudey
27bc773c0b Cleanup: Formatting 2024-08-14 14:20:43 -04:00
Hans Goudey
e04707bf2a Cleanup: Sculpt: Remove last usage of PBVHVertRef visibility function
Pat of #118145.
2024-08-14 14:10:32 -04:00
Hans Goudey
70a24258c6 Sculpt: Remove unused positions array copy with some deform modifiers
Last usage was removed in 0250596f5b.
2024-08-14 14:10:32 -04:00
Sean Kim
e7787f24aa Refactor: Simplify boundary::preview_data_init parameters
* Since displaying this information will only ever happen based on the
  active vert, remove the parameter and fetch it inside the function
* Remove the `PBVHVertRef` usage in favor of `ActiveVert`

Pull Request: https://projects.blender.org/blender/blender/pulls/126256
2024-08-14 19:35:03 +02:00
Hans Goudey
93054f9a0e Refactor: Sculpt: Move original position restore to brush deform step
Instead of running a separate loop before processing the brush
deformation, undo the translations from the previous brush steps
when applying the translation. Avoiding this separate loop over
all geometry should improve performance.
2024-08-14 11:53:16 -04:00
Hans Goudey
658b32093a Refactor: Sculpt: Replace sculpt attribute system for dynamic topology data
Part of #118145.
Use the BMesh functions instead of the sculpt attribute API which we
intend to remove.
2024-08-14 10:25:52 -04:00
Hans Goudey
d065d54972 Fix: Missing sculpt overlays for dynamic topology
Caused by 9eb7e8bfd1.
2024-08-14 10:24:16 -04:00
Hans Goudey
e612260f5c Refactor: Sculpt: Replace sculpt attribute system for persistent base data
Part of #118145.
Use the mesh attribute API instead of the sculpt attribute API which we
intend to remove.
2024-08-14 10:13:37 -04:00
Aras Pranckevicius
df00c30fcd Fix #126201: Video artifacts when rendering into ffmpeg with PNG codec
Started happening with 422dd9404f that introduced multi-threaded
conversions of src->dst (usually RGBA->YUV) format before encoding
the frame with ffmpeg. But the issue itself is not related to
multi-threading, but rather with the fact that AVFrame objects
started to be backed by an AVBuffer object (as that is needed for
threaded swscale to work).

Turns out, if a frame is backed by AVBuffer object, said buffer
might become "non writable" because it got shared (non-1 refcount).
And that happens with some ffmpeg video codecs, particularly PNG one.

Make sure to make the AVFrame objects writable inside
generate_video_frame. This follows official ffmpeg example
(doc/examples/encode_video.c) that explains why that is needed:

"the codec may have kept a reference to the frame in its internal
structures, that makes the frame unwritable. av_frame_make_writable()
checks that and allocates a new buffer for the frame only if necessary"

Pull Request: https://projects.blender.org/blender/blender/pulls/126317
2024-08-14 16:07:11 +02:00
Hans Goudey
7d08d6be6a Fix #126013: Geometry nodes PLY import node skips attributes
Just turn on the option for geometry nodes where attributes are
generally expected to be used. We could expose this and other
options at some point too but that requires a bit more thought.
2024-08-14 08:43:06 -04:00
Omar Emara
075bdbcd63 Nodes: Improve isotropic Gabor noise UI controls
This patch improves the isotropic Gabor noise UI controls such that
variations happen in both directions of the base orientation, as opposed
to being biased in the positive direction only.

Thanks to Charlie Jolly for suggesting this improvement.
2024-08-14 15:26:03 +03:00
Omar Emara
ce89d7949c Nodes: Optimize Gabor noise variance estimation
This patch optimizes the Gabor noise standard deviation estimation by
computing the upper limit of the integral as the frequency approaches
infinity, since the integral is mostly constant for the relevant
frequency range. The limits are 0.25 for the 2D case and 1 / 4 * sqrt2
for the 3D case.

This also improves normalization for low frequencies, possibly due to
the effect of windowing.

Thanks to Charlie Jolly for spotting the optimization.
2024-08-14 14:27:23 +03:00
Sergey Sharybin
1fc6a5b9bd Fix #126108: Crash when EXR image is loaded in image list
Technically the regression was caused by #124472 which made it so
duplicating ImBuf allocates the exact amount of memory needed to
hold the pixels, while before IMB_dupImBuf() would leave the float
buffer over-allocated for images that are less than 4 channels per
pixel.

At the same time IMB_scalefastImBuf() was hard-coded to use 4
channels per pixels, for both byte and float buffers. It did not
crash in Blender 4.1 as it was accessing memory that is over-allocated,
but it also did not generate proper preview.

This fix makes the IMB_scalefastImBuf() to operate on an arbitrary
number of channels in the float buffer.

Pull Request: https://projects.blender.org/blender/blender/pulls/126234
2024-08-14 11:34:29 +02:00
Omar Emara
847a3a7ea3 Nodes: Optimize Gabor noise with early exit
Optimize the Gabor noise texture code with an early exit for points that
are further away from the kernel center. This was already done for the
kernel, but is now being done earlier before computing the weight, so
its computation is now skipped.

Thanks to Charlie Jolly for the suggestion.
2024-08-14 12:12:34 +03:00
Pratik Borhade
8ccf6036e6 Fix: Declaration warning after 7bfdc6dfea 2024-08-14 14:34:55 +05:30
Pratik Borhade
7bfdc6dfea GPv3: Invert weight operator
Port gp legacy "invert weight" operator.

Pull Request: https://projects.blender.org/blender/blender/pulls/126275
2024-08-14 08:55:24 +02:00
Omar Emara
94d3b764e7 Geometry Nodes: Implement Gabor noise node
This patch ports the Gabor noise shader texture node into Geometry
Nodes.

Pull Request: https://projects.blender.org/blender/blender/pulls/125718
2024-08-14 08:48:17 +02:00
Omar Emara
8504ab2070 Fix: Compile error when FFTW is disabled 2024-08-14 09:22:33 +03:00
YimingWu
fec8591464 Fix #126278: Missing finish() call joining .sculpt_face_set
In `mesh_join_offset_face_sets_ID()`, `.sculpt_face_set` is
modified but the `finish()` call wasn't present on the
`SpanAttributeWriter`, leading to warnings and potentially broken
data. This is now fixed.
2024-08-14 11:34:19 +08:00
Sean Kim
63bc8997a0 Fix #126199: Various brushes deform base mesh on non-basis shape key
When restoring the orig_position values for certain brushes, we need to
apply similar logic and avoid updating the base mesh if we are sculpting
on a non-basis shape key.

Pull Request: https://projects.blender.org/blender/blender/pulls/126305
2024-08-14 02:53:47 +02:00
Hans Goudey
2af62ba0f6 Refactor: Sculpt: Reduce usage of BVH tree geometry back pointers
Similar to 9eb7e8bfd1
Pass the object instead of retrieving geometry data from the BVH tree.
2024-08-13 19:01:15 -04:00
Hans Goudey
1661f0728f Cleanup: Remove usage of BKE_pbvh_get_mesh
Part of #118145.
This acts as a back pointer, allowing code that looks like it just deals with
the sculpt BVH tree to do basically anything.
2024-08-13 19:01:15 -04:00
Hans Goudey
c1bb5c03fe Cleanup: Sculpt: Remove now unused parts of automasking API
Part of #118145.
2024-08-13 19:01:15 -04:00
Harley Acheson
8f996f1786 UI: Simplified Feedback for Docking
This simplifies the feedback shown while using the "Interactive Editor
Docking" experimental feature.  It removes the "X" icon shown on areas
that are removed. It does not show an icon for the areas that are left
over and altered. It only shows an icon for the active target area, and
does so without the outline of the icon. The result is a calmer
experience and it is easier to see exactly where the area is going.

Pull Request: https://projects.blender.org/blender/blender/pulls/126304
2024-08-14 00:21:39 +02:00
Sean Kim
58e55ef023 Fix #126293: Crash when moving mouse after enabling Dyntopo
Introduced in 45d9bfa734

We currently do not invalidate the `active_vert` variable when changing
between different mesh implementations. Therefore, it is incorrect to
assume the value can be turned into a valid concrete reference simply
based on the PBVH type.

Pull Request: https://projects.blender.org/blender/blender/pulls/126299
2024-08-13 21:38:13 +02:00
Sean Kim
f7d94d3e73 Fix #126252: Polyline target circle changes color randomly
When the operator was introduced, the program specified the immediate
mode program GPU_SHADER_3D_UNIFORM_COLOR but did not bind a particular
value. This leads to the color used for this circle changing depending
on the last color bound when drawing.

This change makes the color of the circle white, as initially intended,
and adds a darker outline to improve readability.

Pull Request: https://projects.blender.org/blender/blender/pulls/126259
2024-08-13 21:24:27 +02:00