← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/render/intern/source/shadeinput.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/render/intern/source/shadeinput.c
1144
1144
 
1145
1145
                                        zbuf_make_winmat(&R, winmat);
1146
1146
                                        if (shi->obi->flag & R_TRANSFORMED)
1147
 
                                                mult_m4_m4m4(obwinmat, winmat, obi->mat);
 
1147
                                                mul_m4_m4m4(obwinmat, winmat, obi->mat);
1148
1148
                                        else
1149
1149
                                                copy_m4_m4(obwinmat, winmat);
1150
1150
 
1416
1416
                                        xs = (float)x + R.samples->centLut[b & 15] + 0.5f;
1417
1417
                                        ys = (float)y + R.samples->centLut[b >> 4] + 0.5f;
1418
1418
                                }
 
1419
                                else if (R.i.curblur) {
 
1420
                                        xs= (float)x + R.mblur_jit[R.i.curblur-1][0] + 0.5f;
 
1421
                                        ys= (float)y + R.mblur_jit[R.i.curblur-1][1] + 0.5f;
 
1422
                                }
1419
1423
                                else {
1420
1424
                                        xs = (float)x + 0.5f;
1421
1425
                                        ys = (float)y + 0.5f;