Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Code refactor: add separate RGB to BW node and rename some sockets.

Browse Source
This commit is contained in:
Brecht Van Lommel
2016-05-29 12:24:47 +02:00
parent eac7ed8d04
commit 9bd2820aaf
23 changed files with 199 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/shaders/node_magic_texture.osl
View File

@@ -93,7 +93,7 @@ color magic(point p, int n, float distortion)
shader node_magic_texture(
int use_mapping = 0,
matrix mapping = matrix(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
int Depth = 2,
int depth = 2,
float Distortion = 5.0,
float Scale = 5.0,
point Vector = P,
@@ -105,7 +105,7 @@ shader node_magic_texture(
if (use_mapping)
p = transform(mapping, p);
Color = magic(p * Scale, Depth, Distortion);
Color = magic(p * Scale, depth, Distortion);
Fac = (Color[0] + Color[1] + Color[2]) * (1.0 / 3.0);
}