Revision: 55244
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55244
Author: ton
Date: 2013-03-13 15:11:45 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
Bug fix #34620
SHIFT+T (texture space transform) crashed in editmode. Not checking NULL
pointer.
Modified Paths:
--------------
trunk/blender/source/blender/editors/transform/transform.c
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2013-03-13
14:56:17 UTC (rev 55243)
+++ trunk/blender/source/blender/editors/transform/transform.c 2013-03-13
15:11:45 UTC (rev 55244)
@@ -3583,12 +3583,15 @@
if ((t->flag & T_V3D_ALIGN) == 0) { // align mode doesn't
rotate objects itself
/* euler or quaternion? */
if ((td->ext->rotOrder == ROT_MODE_QUAT) || (td->flag &
TD_USEQUAT)) {
- mul_serie_m3(fmat, td->mtx, mat, td->smtx,
NULL, NULL, NULL, NULL, NULL);
- mat3_to_quat(quat, fmat); // Actual transform
-
- mul_qt_qtqt(td->ext->quat, quat,
td->ext->iquat);
- /* this function works on end result */
- protectedQuaternionBits(td->protectflag,
td->ext->quat, td->ext->iquat);
+ /* can be called for texture space translate
for example, then opt out */
+ if (td->ext->quat) {
+ mul_serie_m3(fmat, td->mtx, mat,
td->smtx, NULL, NULL, NULL, NULL, NULL);
+ mat3_to_quat(quat, fmat); // Actual
transform
+
+ mul_qt_qtqt(td->ext->quat, quat,
td->ext->iquat);
+ /* this function works on end result */
+
protectedQuaternionBits(td->protectflag, td->ext->quat, td->ext->iquat);
+ }
}
else if (td->ext->rotOrder == ROT_MODE_AXISANGLE) {
/* calculate effect based on quats */
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
