[Bf-blender-cvs] [d770c8a38ec] soc-2021-curves: Interpolate tilt, radius and weight in curve cut

dilithjay noreply at git.blender.org
Sat Jul 24 19:12:03 CEST 2021


Commit: d770c8a38ec985b8b74b8779ae6f0baa55843159
Author: dilithjay
Date:   Fri Jul 23 22:25:23 2021 +0530
Branches: soc-2021-curves
https://developer.blender.org/rBd770c8a38ec985b8b74b8779ae6f0baa55843159

Interpolate tilt, radius and weight in curve cut

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

M	release/datafiles/locale
M	release/scripts/addons
M	release/scripts/addons_contrib
M	source/blender/editors/curve/editcurve_pen.c

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 62e82958a76..f3791fbfdb8 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 62e82958a760dad775d9b3387d7fb535fd6de4c6
+Subproject commit f3791fbfdb839860035241ba477bf8872966af93
diff --git a/release/scripts/addons b/release/scripts/addons
index 1adb56d8b01..9791dfef7f7 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 1adb56d8b01cf1327f58c6fb8b1ccc8b7efd76ad
+Subproject commit 9791dfef7f73f20a1b8d4bbeac638accc71ce8e1
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 788441f2930..fd1bed98c9e 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 788441f2930465bbfba8f0797b12dcef1d46694d
+Subproject commit fd1bed98c9e0a733451168eecc828cce460205d4
diff --git a/source/blender/editors/curve/editcurve_pen.c b/source/blender/editors/curve/editcurve_pen.c
index 32c7014a54d..a49e02f3608 100644
--- a/source/blender/editors/curve/editcurve_pen.c
+++ b/source/blender/editors/curve/editcurve_pen.c
@@ -544,6 +544,11 @@ static void add_bezt_to_nurb(Nurb *nu, void *op_data, Curve *cu)
     next_bezt = new_bezt + 1;
   }
 
+  /* Interpolate radius, tilt, weight */
+  new_bezt->tilt = interpf(next_bezt->tilt, (new_bezt - 1)->tilt, data->parameter);
+  new_bezt->radius = interpf(next_bezt->radius, (new_bezt - 1)->radius, data->parameter);
+  new_bezt->weight = interpf(next_bezt->weight, (new_bezt - 1)->weight, data->parameter);
+
   free_up_handles_for_movement(new_bezt, true, true);
   free_up_handles_for_movement(new_bezt - 1, false, true);
   free_up_handles_for_movement(next_bezt, true, false);



More information about the Bf-blender-cvs mailing list