[Bf-blender-cvs] [f72cedffb63] master: Cleanup: Use interpf instead of repeating the logic

[Germano Cavalcante]

Commit: f72cedffb63e08abc71ae1c6d31408457b1005a9
Author: Germano Cavalcante
Date:   Tue Jul 12 10:20:01 2022 -0300
Branches: master
https://developer.blender.org/rBf72cedffb63e08abc71ae1c6d31408457b1005a9

Cleanup: Use interpf instead of repeating the logic

This makes the code clearer.

===================================================================

M       source/blender/editors/transform/transform_mode_curveshrinkfatten.c
M       source/blender/editors/transform/transform_mode_gpopacity.c
M       source/blender/editors/transform/transform_mode_gpshrinkfatten.c
M       source/blender/editors/transform/transform_mode_maskshrinkfatten.c

===================================================================

diff --git 
a/source/blender/editors/transform/transform_mode_curveshrinkfatten.c 
b/source/blender/editors/transform/transform_mode_curveshrinkfatten.c
index 7b65417d32b..f7f9e14b8ac 100644
--- a/source/blender/editors/transform/transform_mode_curveshrinkfatten.c
+++ b/source/blender/editors/transform/transform_mode_curveshrinkfatten.c
@@ -64,7 +64,7 @@ static void applyCurveShrinkFatten(TransInfo *t, const int 
UNUSED(mval[2]))
       if (td->val) {
         *td->val = td->ival * ratio;
         /* apply PET */
-        *td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
+        *td->val = interpf(*td->val, td->ival, td->factor);
         CLAMP_MIN(*td->val, 0.0f);
       }
     }
diff --git a/source/blender/editors/transform/transform_mode_gpopacity.c 
b/source/blender/editors/transform/transform_mode_gpopacity.c
index 83dce17d104..8b9431b65ea 100644
--- a/source/blender/editors/transform/transform_mode_gpopacity.c
+++ b/source/blender/editors/transform/transform_mode_gpopacity.c
@@ -74,7 +74,7 @@ static void applyGPOpacity(TransInfo *t, const int 
UNUSED(mval[2]))
       if (td->val) {
         *td->val = td->ival * ratio;
         /* apply PET */
-        *td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
+        *td->val = interpf(*td->val, td->ival, td->factor);
         CLAMP(*td->val, 0.0f, 1.0f);
       }
     }
diff --git a/source/blender/editors/transform/transform_mode_gpshrinkfatten.c 
b/source/blender/editors/transform/transform_mode_gpshrinkfatten.c
index 796d5c7ae9c..d8ec7d4ff50 100644
--- a/source/blender/editors/transform/transform_mode_gpshrinkfatten.c
+++ b/source/blender/editors/transform/transform_mode_gpshrinkfatten.c
@@ -74,7 +74,7 @@ static void applyGPShrinkFatten(TransInfo *t, const int 
UNUSED(mval[2]))
       if (td->val) {
         *td->val = td->ival * ratio;
         /* apply PET */
-        *td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
+        *td->val = interpf(*td->val, td->ival, td->factor);
         if (*td->val <= 0.0f) {
           *td->val = 0.001f;
         }
diff --git a/source/blender/editors/transform/transform_mode_maskshrinkfatten.c 
b/source/blender/editors/transform/transform_mode_maskshrinkfatten.c
index 19a3deade63..e2ccf61796b 100644
--- a/source/blender/editors/transform/transform_mode_maskshrinkfatten.c
+++ b/source/blender/editors/transform/transform_mode_maskshrinkfatten.c
@@ -90,7 +90,7 @@ static void applyMaskShrinkFatten(TransInfo *t, const int 
UNUSED(mval[2]))
         }
 
         /* apply PET */
-        *td->val = (*td->val * td->factor) + ((1.0f - td->factor) * td->ival);
+        *td->val = interpf(*td->val, td->ival, td->factor);
         if (*td->val <= 0.0f) {
           *td->val = 0.001f;
         }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs