← Back to branch summary

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

« back to all changes in this revision

Viewing changes to intern/cycles/kernel/svm/svm_musgrave.h

  • 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/kernel/svm/svm_musgrave.h
41
41
                p *= lacunarity;
42
42
        }
43
43
 
44
 
        rmd = octaves - floor(octaves);
 
44
        rmd = octaves - floorf(octaves);
45
45
        if(rmd != 0.0f)
46
46
                value += rmd * snoise(p) * pwr;
47
47
 
69
69
                p *= lacunarity;
70
70
        }
71
71
 
72
 
        rmd = octaves - floor(octaves);
 
72
        rmd = octaves - floorf(octaves);
73
73
        if(rmd != 0.0f)
74
74
                value *= (rmd * pwr * snoise(p) + 1.0f); /* correct? */
75
75
 
102
102
                p *= lacunarity;
103
103
        }
104
104
 
105
 
        rmd = octaves - floor(octaves);
 
105
        rmd = octaves - floorf(octaves);
106
106
        if(rmd != 0.0f) {
107
107
                increment = (snoise(p) + offset) * pwr * value;
108
108
                value += rmd * increment;
141
141
                p *= lacunarity;
142
142
        }
143
143
 
144
 
        rmd = octaves - floor(octaves);
 
144
        rmd = octaves - floorf(octaves);
145
145
        if(rmd != 0.0f)
146
146
                result += rmd * ((snoise(p) + offset) * pwr);
147
147