← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to intern/cycles/subd/subd_split.cpp

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/cycles/subd/subd_split.cpp
248
248
 
249
249
void DiagSplit::split_triangle(Mesh *mesh, Patch *patch, int shader, bool smooth)
250
250
{
251
 
        TriangleDice::SubPatch sub;
252
 
        TriangleDice::EdgeFactors ef;
253
 
 
254
 
        sub.patch = patch;
255
 
        sub.Pu = make_float2(1.0f, 0.0f);
256
 
        sub.Pv = make_float2(0.0f, 1.0f);
257
 
        sub.Pw = make_float2(0.0f, 0.0f);
258
 
 
259
 
        ef.tu = T(patch, sub.Pv, sub.Pw);
260
 
        ef.tv = T(patch, sub.Pw, sub.Pu);
261
 
        ef.tw = T(patch, sub.Pu, sub.Pv);
262
 
 
263
 
        split(sub, ef);
 
251
        TriangleDice::SubPatch sub_split;
 
252
        TriangleDice::EdgeFactors ef_split;
 
253
 
 
254
        sub_split.patch = patch;
 
255
        sub_split.Pu = make_float2(1.0f, 0.0f);
 
256
        sub_split.Pv = make_float2(0.0f, 1.0f);
 
257
        sub_split.Pw = make_float2(0.0f, 0.0f);
 
258
 
 
259
        ef_split.tu = T(patch, sub_split.Pv, sub_split.Pw);
 
260
        ef_split.tv = T(patch, sub_split.Pw, sub_split.Pu);
 
261
        ef_split.tw = T(patch, sub_split.Pu, sub_split.Pv);
 
262
 
 
263
        split(sub_split, ef_split);
264
264
 
265
265
        TriangleDice dice(mesh, shader, smooth, dicing_rate);
266
266
        dice.camera = camera;
286
286
 
287
287
void DiagSplit::split_quad(Mesh *mesh, Patch *patch, int shader, bool smooth)
288
288
{
289
 
        QuadDice::SubPatch sub;
290
 
        QuadDice::EdgeFactors ef;
291
 
 
292
 
        sub.patch = patch;
293
 
        sub.P00 = make_float2(0.0f, 0.0f);
294
 
        sub.P10 = make_float2(1.0f, 0.0f);
295
 
        sub.P01 = make_float2(0.0f, 1.0f);
296
 
        sub.P11 = make_float2(1.0f, 1.0f);
297
 
 
298
 
        ef.tu0 = T(patch, sub.P00, sub.P10);
299
 
        ef.tu1 = T(patch, sub.P01, sub.P11);
300
 
        ef.tv0 = T(patch, sub.P00, sub.P01);
301
 
        ef.tv1 = T(patch, sub.P10, sub.P11);
302
 
 
303
 
        split(sub, ef);
 
289
        QuadDice::SubPatch sub_split;
 
290
        QuadDice::EdgeFactors ef_split;
 
291
 
 
292
        sub_split.patch = patch;
 
293
        sub_split.P00 = make_float2(0.0f, 0.0f);
 
294
        sub_split.P10 = make_float2(1.0f, 0.0f);
 
295
        sub_split.P01 = make_float2(0.0f, 1.0f);
 
296
        sub_split.P11 = make_float2(1.0f, 1.0f);
 
297
 
 
298
        ef_split.tu0 = T(patch, sub_split.P00, sub_split.P10);
 
299
        ef_split.tu1 = T(patch, sub_split.P01, sub_split.P11);
 
300
        ef_split.tv0 = T(patch, sub_split.P00, sub_split.P01);
 
301
        ef_split.tv1 = T(patch, sub_split.P10, sub_split.P11);
 
302
 
 
303
        split(sub_split, ef_split);
304
304
 
305
305
        QuadDice dice(mesh, shader, smooth, dicing_rate);
306
306
        dice.camera = camera;