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:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-03-15 04:30:20 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-03-15 04:30:20 +0400
commited053f4730d8c78c6fa9e8a4de47e946abcceae9 (patch)
tree05faf03fd5466ebea3294e78465b647d87031c90 /release/scripts/freestyle/style_modules
parent894c240f9d007271e9d587d3c1b6f961c445b1b8 (diff)
Fix for the Selection by Image Border not taking account of resolution percentage.
Problem report by octane98 in the BlenderArtists Freestyle thread in June 2012, thanks a lot!
Diffstat (limited to 'release/scripts/freestyle/style_modules')
-rw-r--r--release/scripts/freestyle/style_modules/parameter_editor.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/freestyle/style_modules/parameter_editor.py b/release/scripts/freestyle/style_modules/parameter_editor.py
index 36d49d006a3..0d855b2eff2 100644
--- a/release/scripts/freestyle/style_modules/parameter_editor.py
+++ b/release/scripts/freestyle/style_modules/parameter_editor.py
@@ -1043,8 +1043,9 @@ def process(layer_name, lineset_name):
selection_criteria.append(upred)
# prepare selection criteria by image border
if lineset.select_by_image_border:
- w = scene.render.resolution_x
- h = scene.render.resolution_y
+ fac = scene.render.resolution_percentage / 100.0
+ w = scene.render.resolution_x * fac
+ h = scene.render.resolution_y * fac
if scene.render.use_border:
xmin = scene.render.border_min_x * w
xmax = scene.render.border_max_x * w