← Back to branch summary

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

« back to all changes in this revision

Viewing changes to intern/cycles/kernel/shaders/node_gradient_texture.osl

  • 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:
intern/cycles/kernel/shaders/node_gradient_texture.osl
45
45
                result = (3.0 * t - 2.0 * t * r);
46
46
        }
47
47
        else if (type == "Diagonal") {
48
 
                result = (x + y) / 2.0;
 
48
                result = (x + y) * 0.5;
49
49
        }
50
50
        else if (type == "Radial") {
51
 
                result = atan2(y, x) / (2.0 * M_PI) + 0.5;
 
51
                result = atan2(y, x) / M_2PI + 0.5;
52
52
        }
53
53
        else {
54
54
                float r = max(1.0 - sqrt(x * x + y * y + z * z), 0.0);