[Bf-blender-cvs] [07ccb8b97c7] master: Fix crash with font on curve

Sergey Sharybin noreply at git.blender.org
Fri Feb 9 10:14:25 CET 2018


Commit: 07ccb8b97c71eff0cbf1da4465fef5c46cd6d58f
Author: Sergey Sharybin
Date:   Fri Feb 9 10:13:42 2018 +0100
Branches: master
https://developer.blender.org/rB07ccb8b97c71eff0cbf1da4465fef5c46cd6d58f

Fix crash with font on curve

Was a mistake from recent texspace changes.

Reported by Pablo here in the studio!

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

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

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

diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index a314cc0a131..5545eba8764 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -1080,8 +1080,13 @@ makebreak:
 			float distfac, imat[4][4], imat3[3][3], cmat[3][3];
 			float minx, maxx, miny, maxy;
 			float timeofs, sizefac;
-			
-			invert_m4_m4(imat, ob->obmat);
+
+			if (ob != NULL) {
+				invert_m4_m4(imat, ob->obmat);
+			}
+			else {
+				unit_m4(imat);
+			}
 			copy_m3_m4(imat3, imat);
 
 			copy_m3_m4(cmat, cu->textoncurve->obmat);



More information about the Bf-blender-cvs mailing list