diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-21 02:26:29 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-21 02:26:29 +0300 |
commit | a9ba96896a627688be3359bf6a9d7e25995aa631 (patch) | |
tree | dea6a458787470ae2b046acd5247838e343323be /release/scripts/presets/sss | |
parent | 4530b4984cc0bee1e67115c883dfaa98076832a9 (diff) |
modified fix for commits r33811, 33812.
- SSS Presets were not working on pinned materials.
- added ability for save-presets to define variables to stop them becoming too verbose.
- remove object.active_node_material
Diffstat (limited to 'release/scripts/presets/sss')
-rw-r--r-- | release/scripts/presets/sss/apple.py | 6 | ||||
-rw-r--r-- | release/scripts/presets/sss/chicken.py | 6 | ||||
-rw-r--r-- | release/scripts/presets/sss/cream.py | 6 | ||||
-rw-r--r-- | release/scripts/presets/sss/ketchup.py | 6 | ||||
-rw-r--r-- | release/scripts/presets/sss/marble.py | 6 | ||||
-rw-r--r-- | release/scripts/presets/sss/potato.py | 6 | ||||
-rw-r--r-- | release/scripts/presets/sss/skim_milk.py | 6 | ||||
-rw-r--r-- | release/scripts/presets/sss/skin1.py | 6 | ||||
-rw-r--r-- | release/scripts/presets/sss/skin2.py | 6 | ||||
-rw-r--r-- | release/scripts/presets/sss/whole_milk.py | 6 |
10 files changed, 40 insertions, 20 deletions
diff --git a/release/scripts/presets/sss/apple.py b/release/scripts/presets/sss/apple.py index 52ed4642ac6..c5f60ee5095 100644 --- a/release/scripts/presets/sss/apple.py +++ b/release/scripts/presets/sss/apple.py @@ -1,3 +1,5 @@ import bpy -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 +material = (bpy.context.material.active_node_material if bpy.context.material.active_node_material else bpy.context.material) + +material.subsurface_scattering.radius = 11.605, 3.884, 1.754 +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 1891ef95555..9acc2f3e25f 100644 --- a/release/scripts/presets/sss/chicken.py +++ b/release/scripts/presets/sss/chicken.py @@ -1,3 +1,5 @@ import bpy -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 +material = (bpy.context.material.active_node_material if bpy.context.material.active_node_material else bpy.context.material) + +material.subsurface_scattering.radius = 9.436, 3.348, 1.790 +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 c5e812ffd19..c03cc0243d9 100644 --- a/release/scripts/presets/sss/cream.py +++ b/release/scripts/presets/sss/cream.py @@ -1,3 +1,5 @@ import bpy -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 +material = (bpy.context.material.active_node_material if bpy.context.material.active_node_material else bpy.context.material) + +material.subsurface_scattering.radius = 15.028, 4.664, 2.541 +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 d5674676282..b94c7cced27 100644 --- a/release/scripts/presets/sss/ketchup.py +++ b/release/scripts/presets/sss/ketchup.py @@ -1,3 +1,5 @@ import bpy -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 +material = (bpy.context.material.active_node_material if bpy.context.material.active_node_material else bpy.context.material) + +material.subsurface_scattering.radius = 4.762, 0.575, 0.394 +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 ad753a7a770..c85719900e2 100644 --- a/release/scripts/presets/sss/marble.py +++ b/release/scripts/presets/sss/marble.py @@ -1,3 +1,5 @@ import bpy -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 +material = (bpy.context.material.active_node_material if bpy.context.material.active_node_material else bpy.context.material) + +material.subsurface_scattering.radius = 8.509, 5.566, 3.951 +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 3610c16198f..74807014bd3 100644 --- a/release/scripts/presets/sss/potato.py +++ b/release/scripts/presets/sss/potato.py @@ -1,3 +1,5 @@ import bpy -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 +material = (bpy.context.material.active_node_material if bpy.context.material.active_node_material else bpy.context.material) + +material.subsurface_scattering.radius = 14.266, 7.228, 2.036 +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 eec84f72aa9..163659faf34 100644 --- a/release/scripts/presets/sss/skim_milk.py +++ b/release/scripts/presets/sss/skim_milk.py @@ -1,3 +1,5 @@ import bpy -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 +material = (bpy.context.material.active_node_material if bpy.context.material.active_node_material else bpy.context.material) + +material.subsurface_scattering.radius = 18.424, 10.443, 3.502 +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 ba991f8d0d8..ef284019637 100644 --- a/release/scripts/presets/sss/skin1.py +++ b/release/scripts/presets/sss/skin1.py @@ -1,3 +1,5 @@ import bpy -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 +material = (bpy.context.material.active_node_material if bpy.context.material.active_node_material else bpy.context.material) + +material.subsurface_scattering.radius = 3.673, 1.367, 0.683 +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 6ac55633619..16a7d154309 100644 --- a/release/scripts/presets/sss/skin2.py +++ b/release/scripts/presets/sss/skin2.py @@ -1,3 +1,5 @@ import bpy -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 +material = (bpy.context.material.active_node_material if bpy.context.material.active_node_material else bpy.context.material) + +material.subsurface_scattering.radius = 4.821, 1.694, 1.090 +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 4421fc36004..c11b18557e3 100644 --- a/release/scripts/presets/sss/whole_milk.py +++ b/release/scripts/presets/sss/whole_milk.py @@ -1,3 +1,5 @@ import bpy -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 +material = (bpy.context.material.active_node_material if bpy.context.material.active_node_material else bpy.context.material) + +material.subsurface_scattering.radius = 10.899, 6.575, 2.508 +material.subsurface_scattering.color = 0.947, 0.931, 0.852 |