Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-05-01 04:09:22 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-05-01 04:13:14 +0300
commit909665a0d4ed23620afc537c583a6e84cdee50b9 (patch)
treeada49fe1ae8d78bc5e0c7a79fcccbc2ceaa8a8b8 /source/blender/render
parentf70470b540b78c220f9679c6de2efb4bafc80648 (diff)
ClangFormat: run with ReflowComments on source/
Prepare for enabling ReflowComments.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/imagetexture.c8
-rw-r--r--source/blender/render/intern/source/render_texture.c8
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c
index c62322a2af4..c147794dae7 100644
--- a/source/blender/render/intern/source/imagetexture.c
+++ b/source/blender/render/intern/source/imagetexture.c
@@ -1781,8 +1781,8 @@ int imagewraposa(Tex *tex,
if (texres->nor && (tex->imaflag & TEX_NORMALMAP) == 0) {
/* a bit extra filter */
- //minx*= 1.35f;
- //miny*= 1.35f;
+ // minx*= 1.35f;
+ // miny*= 1.35f;
boxsample(
curibuf, fx - minx, fy - miny, fx + minx, fy + miny, texres, imaprepeat, imapextend);
@@ -2005,8 +2005,8 @@ void ibuf_sample(ImBuf *ibuf, float fx, float fy, float dx, float dy, float resu
AFD.dxt[1] = dx;
AFD.dyt[0] = dy;
AFD.dyt[1] = dy;
- //copy_v2_v2(AFD.dxt, dx);
- //copy_v2_v2(AFD.dyt, dy);
+ // copy_v2_v2(AFD.dxt, dx);
+ // copy_v2_v2(AFD.dyt, dy);
AFD.intpol = 1;
AFD.extflag = TXC_EXTD;
diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c
index de3cff62537..67555b70be2 100644
--- a/source/blender/render/intern/source/render_texture.c
+++ b/source/blender/render/intern/source/render_texture.c
@@ -271,10 +271,10 @@ static float tex_tri(float a)
static float wood_int(Tex *tex, float x, float y, float z)
{
float wi = 0;
- short wf =
- tex->noisebasis2; /* wave form: TEX_SIN=0, TEX_SAW=1, TEX_TRI=2 */
- short wt =
- tex->stype; /* wood type: TEX_BAND=0, TEX_RING=1, TEX_BANDNOISE=2, TEX_RINGNOISE=3 */
+ /* wave form: TEX_SIN=0, TEX_SAW=1, TEX_TRI=2 */
+ short wf = tex->noisebasis2;
+ /* wood type: TEX_BAND=0, TEX_RING=1, TEX_BANDNOISE=2, TEX_RINGNOISE=3 */
+ short wt = tex->stype;
float (*waveform[3])(float); /* create array of pointers to waveform functions */
waveform[0] = tex_sin; /* assign address of tex_sin() function to pointer array */