← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/python/mathutils/mathutils_Matrix.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/python/mathutils/mathutils_Matrix.c
371
371
                                        }
372
372
                                }
373
373
                        }
 
374
                        break;
374
375
                }
375
376
        }
376
377
 
521
522
                axis_angle_to_mat3((float (*)[3])mat, tvec, angle);
522
523
        }
523
524
        else if (matSize == 2) {
524
 
                const float angle_cos = cosf(angle);
525
 
                const float angle_sin = sinf(angle);
 
525
                angle_to_mat2((float (*)[2])mat, angle);
526
526
 
527
 
                /* 2D rotation matrix */
528
 
                mat[0] =  angle_cos;
529
 
                mat[1] =  angle_sin;
530
 
                mat[2] = -angle_sin;
531
 
                mat[3] =  angle_cos;
532
527
        }
533
528
        else {
534
529
                /* valid axis checked above */
535
 
                single_axis_angle_to_mat3((float (*)[3])mat, axis[0], angle);
 
530
                axis_angle_to_mat3_single((float (*)[3])mat, axis[0], angle);
536
531
        }
537
532
 
538
533
        if (matSize == 4) {
1752
1747
 
1753
1748
        switch (op) {
1754
1749
                case Py_NE:
1755
 
                        ok = !ok; /* pass through */
 
1750
                        ok = !ok;
 
1751
                        /* fall-through */
1756
1752
                case Py_EQ:
1757
1753
                        res = ok ? Py_False : Py_True;
1758
1754
                        break;