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:
authorTon Roosendaal <ton@blender.org>2010-12-20 16:03:03 +0300
committerTon Roosendaal <ton@blender.org>2010-12-20 16:03:03 +0300
commit291a66d21234dcc7593db5ac8b887d2f04f37f99 (patch)
tree5eabb5298e654d3b8d5bee16baec8f5b72da267d /release/scripts/presets/sss
parent6b1258f5b899d9aa0ad4e0c995dd637801b44aba (diff)
Bugfix: material SSS presets now copy correctly to the displayed
material (in case it has nodes)
Diffstat (limited to 'release/scripts/presets/sss')
-rw-r--r--release/scripts/presets/sss/apple.py4
-rw-r--r--release/scripts/presets/sss/chicken.py4
-rw-r--r--release/scripts/presets/sss/cream.py4
-rw-r--r--release/scripts/presets/sss/ketchup.py4
-rw-r--r--release/scripts/presets/sss/marble.py4
-rw-r--r--release/scripts/presets/sss/potato.py4
-rw-r--r--release/scripts/presets/sss/skim_milk.py4
-rw-r--r--release/scripts/presets/sss/skin1.py4
-rw-r--r--release/scripts/presets/sss/skin2.py4
-rw-r--r--release/scripts/presets/sss/whole_milk.py4
10 files changed, 20 insertions, 20 deletions
diff --git a/release/scripts/presets/sss/apple.py b/release/scripts/presets/sss/apple.py
index d505be2b435..52ed4642ac6 100644
--- a/release/scripts/presets/sss/apple.py
+++ b/release/scripts/presets/sss/apple.py
@@ -1,3 +1,3 @@
import bpy
-bpy.context.active_object.active_material.subsurface_scattering.radius = 11.605, 3.884, 1.754
-bpy.context.active_object.active_material.subsurface_scattering.color = 0.430, 0.210, 0.168
+bpy.context.active_object.active_node_material.subsurface_scattering.radius = 11.605, 3.884, 1.754
+bpy.context.active_object.active_node_material.subsurface_scattering.color = 0.430, 0.210, 0.168
diff --git a/release/scripts/presets/sss/chicken.py b/release/scripts/presets/sss/chicken.py
index 53e199455c1..1891ef95555 100644
--- a/release/scripts/presets/sss/chicken.py
+++ b/release/scripts/presets/sss/chicken.py
@@ -1,3 +1,3 @@
import bpy
-bpy.context.active_object.active_material.subsurface_scattering.radius = 9.436, 3.348, 1.790
-bpy.context.active_object.active_material.subsurface_scattering.color = 0.439, 0.216, 0.141
+bpy.context.active_object.active_node_material.subsurface_scattering.radius = 9.436, 3.348, 1.790
+bpy.context.active_object.active_node_material.subsurface_scattering.color = 0.439, 0.216, 0.141
diff --git a/release/scripts/presets/sss/cream.py b/release/scripts/presets/sss/cream.py
index 221739a30ab..c5e812ffd19 100644
--- a/release/scripts/presets/sss/cream.py
+++ b/release/scripts/presets/sss/cream.py
@@ -1,3 +1,3 @@
import bpy
-bpy.context.active_object.active_material.subsurface_scattering.radius = 15.028, 4.664, 2.541
-bpy.context.active_object.active_material.subsurface_scattering.color = 0.987, 0.943, 0.827
+bpy.context.active_object.active_node_material.subsurface_scattering.radius = 15.028, 4.664, 2.541
+bpy.context.active_object.active_node_material.subsurface_scattering.color = 0.987, 0.943, 0.827
diff --git a/release/scripts/presets/sss/ketchup.py b/release/scripts/presets/sss/ketchup.py
index 96d136dc271..d5674676282 100644
--- a/release/scripts/presets/sss/ketchup.py
+++ b/release/scripts/presets/sss/ketchup.py
@@ -1,3 +1,3 @@
import bpy
-bpy.context.active_object.active_material.subsurface_scattering.radius = 4.762, 0.575, 0.394
-bpy.context.active_object.active_material.subsurface_scattering.color = 0.222, 0.008, 0.002
+bpy.context.active_object.active_node_material.subsurface_scattering.radius = 4.762, 0.575, 0.394
+bpy.context.active_object.active_node_material.subsurface_scattering.color = 0.222, 0.008, 0.002
diff --git a/release/scripts/presets/sss/marble.py b/release/scripts/presets/sss/marble.py
index cd68fd7d26f..ad753a7a770 100644
--- a/release/scripts/presets/sss/marble.py
+++ b/release/scripts/presets/sss/marble.py
@@ -1,3 +1,3 @@
import bpy
-bpy.context.active_object.active_material.subsurface_scattering.radius = 8.509, 5.566, 3.951
-bpy.context.active_object.active_material.subsurface_scattering.color = 0.925, 0.905, 0.884
+bpy.context.active_object.active_node_material.subsurface_scattering.radius = 8.509, 5.566, 3.951
+bpy.context.active_object.active_node_material.subsurface_scattering.color = 0.925, 0.905, 0.884
diff --git a/release/scripts/presets/sss/potato.py b/release/scripts/presets/sss/potato.py
index 7a6c25db833..3610c16198f 100644
--- a/release/scripts/presets/sss/potato.py
+++ b/release/scripts/presets/sss/potato.py
@@ -1,3 +1,3 @@
import bpy
-bpy.context.active_object.active_material.subsurface_scattering.radius = 14.266, 7.228, 2.036
-bpy.context.active_object.active_material.subsurface_scattering.color = 0.855, 0.740, 0.292
+bpy.context.active_object.active_node_material.subsurface_scattering.radius = 14.266, 7.228, 2.036
+bpy.context.active_object.active_node_material.subsurface_scattering.color = 0.855, 0.740, 0.292
diff --git a/release/scripts/presets/sss/skim_milk.py b/release/scripts/presets/sss/skim_milk.py
index 5be37b820da..eec84f72aa9 100644
--- a/release/scripts/presets/sss/skim_milk.py
+++ b/release/scripts/presets/sss/skim_milk.py
@@ -1,3 +1,3 @@
import bpy
-bpy.context.active_object.active_material.subsurface_scattering.radius = 18.424, 10.443, 3.502
-bpy.context.active_object.active_material.subsurface_scattering.color = 0.889, 0.888, 0.796
+bpy.context.active_object.active_node_material.subsurface_scattering.radius = 18.424, 10.443, 3.502
+bpy.context.active_object.active_node_material.subsurface_scattering.color = 0.889, 0.888, 0.796
diff --git a/release/scripts/presets/sss/skin1.py b/release/scripts/presets/sss/skin1.py
index 76dc64f61f9..ba991f8d0d8 100644
--- a/release/scripts/presets/sss/skin1.py
+++ b/release/scripts/presets/sss/skin1.py
@@ -1,3 +1,3 @@
import bpy
-bpy.context.active_object.active_material.subsurface_scattering.radius = 3.673, 1.367, 0.683
-bpy.context.active_object.active_material.subsurface_scattering.color = 0.574, 0.313, 0.174
+bpy.context.active_object.active_node_material.subsurface_scattering.radius = 3.673, 1.367, 0.683
+bpy.context.active_object.active_node_material.subsurface_scattering.color = 0.574, 0.313, 0.174
diff --git a/release/scripts/presets/sss/skin2.py b/release/scripts/presets/sss/skin2.py
index 6a72a782638..6ac55633619 100644
--- a/release/scripts/presets/sss/skin2.py
+++ b/release/scripts/presets/sss/skin2.py
@@ -1,3 +1,3 @@
import bpy
-bpy.context.active_object.active_material.subsurface_scattering.radius = 4.821, 1.694, 1.090
-bpy.context.active_object.active_material.subsurface_scattering.color = 0.749, 0.571, 0.467
+bpy.context.active_object.active_node_material.subsurface_scattering.radius = 4.821, 1.694, 1.090
+bpy.context.active_object.active_node_material.subsurface_scattering.color = 0.749, 0.571, 0.467
diff --git a/release/scripts/presets/sss/whole_milk.py b/release/scripts/presets/sss/whole_milk.py
index 59aaa135933..4421fc36004 100644
--- a/release/scripts/presets/sss/whole_milk.py
+++ b/release/scripts/presets/sss/whole_milk.py
@@ -1,3 +1,3 @@
import bpy
-bpy.context.active_object.active_material.subsurface_scattering.radius = 10.899, 6.575, 2.508
-bpy.context.active_object.active_material.subsurface_scattering.color = 0.947, 0.931, 0.852
+bpy.context.active_object.active_node_material.subsurface_scattering.radius = 10.899, 6.575, 2.508
+bpy.context.active_object.active_node_material.subsurface_scattering.color = 0.947, 0.931, 0.852