← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/collada/ArmatureExporter.cpp

  • 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/collada/ArmatureExporter.cpp
193
193
                                        // and not it's head, seems arbitrary.
194
194
                                        (*i)->parentinv[3][1] += bone->length;
195
195
 
196
 
                                        // SECOND_LIFE_COMPATIBILITY
 
196
                                        // OPEN_SIM_COMPATIBILITY
197
197
                                        // TODO: when such objects are animated as
198
198
                                        // single matrix the tweak must be applied
199
199
                                        // to the result.
200
 
                                        if (export_settings->second_life) {
 
200
                                        if (export_settings->open_sim) {
201
201
                                                // tweak objects parentinverse to match compatibility
202
202
                                                float temp[4][4];
203
203
 
272
272
                copy_m4_m4(mat, bone->arm_mat);
273
273
        }
274
274
 
275
 
        // SECOND_LIFE_COMPATIBILITY
276
 
        if (export_settings->second_life) {
 
275
        // OPEN_SIM_COMPATIBILITY
 
276
        if (export_settings->open_sim) {
277
277
                // Remove rotations vs armature from transform
278
278
                // parent_rest_rot * mat * irest_rot
279
279
                float temp[4][4];