[Bf-blender-cvs] [d59f45fb15c] master: Cleanup: remove dead code from text wrapping logic

Campbell Barton noreply at git.blender.org
Thu Feb 24 02:55:08 CET 2022


Commit: d59f45fb15c9aec836bc2e3dbdd87679e2f485ec
Author: Campbell Barton
Date:   Thu Feb 24 12:53:11 2022 +1100
Branches: master
https://developer.blender.org/rBd59f45fb15c9aec836bc2e3dbdd87679e2f485ec

Cleanup: remove dead code from text wrapping logic

Error from original commit in 2005,
97df61a7e5391e302d1a5f9069cf0b388f85e0c8.

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

M	source/blender/blenkernel/intern/vfont.c

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

diff --git a/source/blender/blenkernel/intern/vfont.c b/source/blender/blenkernel/intern/vfont.c
index 5e75088a008..3af09f22fa9 100644
--- a/source/blender/blenkernel/intern/vfont.c
+++ b/source/blender/blenkernel/intern/vfont.c
@@ -1018,17 +1018,7 @@ static bool vfont_to_curve(Object *ob,
             dobreak = true;
             break;
           }
-          if (chartransdata[j].dobreak) {
-            // CLOG_WARN(&LOG, "word too long: %c%c%c...", mem[j], mem[j+1], mem[j+2]);
-            ct->dobreak = 1;
-            custrinfo[i + 1].flag |= CU_CHINFO_WRAP;
-            ct -= 1;
-            cnr -= 1;
-            i--;
-            xof = ct->xof;
-            dobreak = true;
-            break;
-          }
+          BLI_assert(chartransdata[j].dobreak == 0);
         }
 
         if (dobreak) {



More information about the Bf-blender-cvs mailing list