← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/render/intern/include/texture.h

  • 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:
source/blender/render/intern/include/texture.h
35
35
 
36
36
#define BRICONT                                                               \
37
37
        texres->tin= (texres->tin-0.5f) * tex->contrast+tex->bright-0.5f;         \
38
 
        if(texres->tin < 0.0f)      texres->tin= 0.0f;                            \
39
 
        else if(texres->tin > 1.0f) texres->tin= 1.0f;                            \
 
38
        if (texres->tin < 0.0f)      texres->tin= 0.0f;                           \
 
39
        else if (texres->tin > 1.0f) texres->tin= 1.0f;                           \
40
40
 
41
41
#define BRICONTRGB                                                            \
42
42
        texres->tr= tex->rfac*((texres->tr-0.5f)*tex->contrast+tex->bright-0.5f); \
43
 
        if(texres->tr<0.0f) texres->tr= 0.0f;                                     \
 
43
        if (texres->tr<0.0f) texres->tr= 0.0f;                                    \
44
44
        texres->tg= tex->gfac*((texres->tg-0.5f)*tex->contrast+tex->bright-0.5f); \
45
 
        if(texres->tg<0.0f) texres->tg= 0.0f;                                     \
 
45
        if (texres->tg<0.0f) texres->tg= 0.0f;                                    \
46
46
        texres->tb= tex->bfac*((texres->tb-0.5f)*tex->contrast+tex->bright-0.5f); \
47
 
        if(texres->tb<0.0f) texres->tb= 0.0f;                                     \
48
 
        if(tex->saturation != 1.0f) {                                             \
 
47
        if (texres->tb<0.0f) texres->tb= 0.0f;                                    \
 
48
        if (tex->saturation != 1.0f) {                                            \
49
49
                float _hsv[3];                                                        \
50
50
                rgb_to_hsv(texres->tr, texres->tg, texres->tb,                        \
51
51
                           _hsv, _hsv+1, _hsv+2);                                     \