blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Texture Painting: Fix Seam Bleeding of Non-Manifold Sections of Mesh #105336

Merged
Jeroen Bakker merged 6 commits from Jeroen-Bakker/blender:3dtexturing-fix-seam-bleeding-non-manifold into main 2023-03-09 16:11:14 +01:00
Conversation 0 Commits 6 Files Changed 8 -13
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 49875a33a4 - Show all commits

7
source/blender/blenkernel/BKE_pbvh_pixels.hh
View File

@ -382,13 +382,6 @@ struct CopyPixelTile {
for (const DeltaCopyPixelCommand &item : Span<const DeltaCopyPixelCommand>(
&command_deltas[group.start_delta_index], group.num_deltas)) {
copy_command.apply(item);
/*
printf("| %d,%d | %d,%d | %d,%d | %f |\n",
UNPACK2(copy_command.destination),
UNPACK2(copy_command.source_1),
UNPACK2(copy_command.source_2),
copy_command.mix_factor);
*/
copy_command.mix_source_and_write_destination<T>(image_buffer);
}
}

6
source/blender/blenkernel/intern/pbvh_pixels_copy.cc
View File

@ -19,8 +19,6 @@
#include "pbvh_pixels_copy.hh"
#include "pbvh_uv_islands.hh"
#include "PIL_time_utildefines.h"
namespace blender::bke::pbvh::pixels {
const int THREADING_GRAIN_SIZE = 128;
@ -506,7 +504,6 @@ void BKE_pbvh_pixels_copy_update(PBVH &pbvh,
ImageUser &image_user,
const uv_islands::MeshData &mesh_data)
{
TIMEIT_START(pbvh_pixels_copy_update);
PBVHData &pbvh_data = BKE_pbvh_pixels_data_get(pbvh);
pbvh_data.tiles_copy_pixels.clear();
const NonManifoldUVEdges non_manifold_edges(mesh_data);
@ -545,7 +542,6 @@ void BKE_pbvh_pixels_copy_update(PBVH &pbvh,
copy_tile.print_compression_rate();
pbvh_data.tiles_copy_pixels.tiles.append(copy_tile);
}
TIMEIT_END(pbvh_pixels_copy_update);
}
void BKE_pbvh_pixels_copy_pixels(PBVH &pbvh,
@ -553,7 +549,6 @@ void BKE_pbvh_pixels_copy_pixels(PBVH &pbvh,
ImageUser &image_user,
image::TileNumber tile_number)
{
// TIMEIT_START(pbvh_pixels_copy_pixels);
PBVHData &pbvh_data = BKE_pbvh_pixels_data_get(pbvh);
std::optional<std::reference_wrapper<CopyPixelTile>> pixel_tile =
pbvh_data.tiles_copy_pixels.find_tile(tile_number);
@ -576,7 +571,6 @@ void BKE_pbvh_pixels_copy_pixels(PBVH &pbvh,
});
BKE_image_release_ibuf(&image, tile_buffer, nullptr);
// TIMEIT_END(pbvh_pixels_copy_pixels);
}
} // namespace blender::bke::pbvh::pixels