blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

WIP: Brush assets project #106303

Draft
Julian Eisel wants to merge 357 commits from brush-assets-project into main
pull from: brush-assets-project
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 8 Commits 357 Files Changed 123 +5 -2
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a18b0405f0 - Show all commits

7
source/blender/editors/sculpt_paint/paint_image.cc
View File

@ -818,8 +818,11 @@ static blender::float3 paint_init_pivot_mesh(Object *ob)
static blender::float3 paint_init_pivot_curves(Object *ob)
{
const Curves &curves = *static_cast<const Curves *>(ob->data);
const blender::Bounds<blender::float3> bounds = *curves.geometry.wrap().bounds_min_max();
return blender::math::midpoint(bounds.min, bounds.max);
const std::optional<blender::Bounds<blender::float3>> bounds = curves.geometry.wrap().bounds_min_max();
if (bounds.has_value()) {
return blender::math::midpoint(bounds->min, bounds->max);
}
return blender::float3(0);
}
static blender::float3 paint_init_pivot_grease_pencil(Object *ob, const int frame)