← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to intern/cycles/bvh/bvh.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:
intern/cycles/bvh/bvh.cpp
295
295
        *       extra curve data <3>    , StrID,
296
296
        *       nextkey, flags/tip?,    0, 0);
297
297
        */
298
 
        Attribute *attr_tangent = mesh->curve_attributes.find(ATTR_STD_CURVE_TANGENT);
299
298
        float3 tg0 = make_float3(1.0f, 0.0f, 0.0f);
300
299
        float3 tg1 = make_float3(1.0f, 0.0f, 0.0f);
301
 
 
302
 
        if(attr_tangent) {
303
 
                const float3 *data_tangent = attr_tangent->data_float3();
304
 
 
305
 
                tg0 = data_tangent[k0];
306
 
                tg1 = data_tangent[k1];
307
 
        }
308
300
        
309
301
        Transform tfm = make_transform(
310
302
                tg0.x, tg0.y, tg0.z, l,