griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.5-release'

Browse Source
This commit is contained in:
Omar Emara
2025-06-10 09:48:10 +03:00
parent 3cdd38da67 a48e599bea
commit 82ccbe7a97
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/nodes/composite/nodes/node_composite_boxmask.cc
View File

@@ -259,18 +259,14 @@ class BoxMaskOperation : public NodeOperation {
float2 get_location()
{
return math::clamp(
this->get_input("Position").get_single_value_default(float3(0.5f, 0.5f, 0.0f)).xy(),
float2(-0.5f),
float2(1.5f));
return this->get_input("Position").get_single_value_default(float3(0.5f, 0.5f, 0.0f)).xy();
}
float2 get_size()
{
return math::clamp(
this->get_input("Size").get_single_value_default(float3(0.2f, 0.1f, 0.0f)).xy(),
return math::max(
float2(0.0f),
float2(1.0f));
this->get_input("Size").get_single_value_default(float3(0.2f, 0.1f, 0.0f)).xy());
}
float get_angle()

10
source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc
View File

@@ -263,18 +263,14 @@ class EllipseMaskOperation : public NodeOperation {
float2 get_location()
{
return math::clamp(
this->get_input("Position").get_single_value_default(float3(0.5f, 0.5f, 0.0f)).xy(),
float2(-0.5f),
float2(1.5f));
return this->get_input("Position").get_single_value_default(float3(0.5f, 0.5f, 0.0f)).xy();
}
float2 get_size()
{
return math::clamp(
this->get_input("Size").get_single_value_default(float3(0.2f, 0.1f, 0.0f)).xy(),
return math::max(
float2(0.0f),
float2(1.0f));
this->get_input("Size").get_single_value_default(float3(0.2f, 0.1f, 0.0f)).xy());
}
float get_angle()