diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-10-31 17:18:14 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-10-31 17:18:14 +0400 |
| commit | cd338a4130011ed9eccc7b131b11e4261b9dc269 (patch) | |
| tree | 767bb3edaa08fef0bb6ff039fced376f9a00e9c3 /source/blender/nodes | |
| parent | 0a37e6ab976344818483df899b4fc44aedb30613 (diff) | |
| parent | a664e779ac8be0f926221d4c064394f9b3b6a801 (diff) | |
Merge with trunk r41411
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/composite/nodes/node_composite_mixrgb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c index 6732803f19c..0f5a2b61b87 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mixrgb.c +++ b/source/blender/nodes/composite/nodes/node_composite_mixrgb.c @@ -33,9 +33,9 @@ /* **************** MIX RGB ******************** */ static bNodeSocketTemplate cmp_node_mix_rgb_in[]= { - { SOCK_FLOAT, 1, "Fac", 0.5f, 0.0f, 0.0f, 0.0f, 0.0f, 5.0f, PROP_FACTOR}, - { SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f}, - { SOCK_RGBA, 1, "Image", 0.8f, 0.8f, 0.8f, 1.0f}, + { SOCK_FLOAT, 1, "Fac", 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 5.0f, PROP_FACTOR}, + { SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.0f}, + { SOCK_RGBA, 1, "Image", 1.0f, 1.0f, 1.0f, 1.0f}, { -1, 0, "" } }; static bNodeSocketTemplate cmp_node_mix_rgb_out[]= { |