griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build

Browse Source
This commit is contained in:
Campbell Barton
2011-11-10 04:17:43 +00:00
parent a96c3ce9e0 77c5160791
commit 121ff4223d
366 changed files with 72305 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
release/scripts/presets/cycles/integrator/direct_light.py Normal file
View File

@@ -0,0 +1,11 @@
import bpy
cycles = bpy.context.scene.cycles
cycles.max_bounces = 8
cycles.min_bounces = 8
cycles.no_caustics = True
cycles.diffuse_bounces = 0
cycles.glossy_bounces = 1
cycles.transmission_bounces = 2
cycles.transparent_min_bounces = 8
cycles.transparent_max_bounces = 8

11
release/scripts/presets/cycles/integrator/full_global_illumination.py Normal file
View File

@@ -0,0 +1,11 @@
import bpy
cycles = bpy.context.scene.cycles
cycles.max_bounces = 128
cycles.min_bounces = 3
cycles.no_caustics = False
cycles.diffuse_bounces = 128
cycles.glossy_bounces = 128
cycles.transmission_bounces = 128
cycles.transparent_min_bounces = 8
cycles.transparent_max_bounces = 128

11
release/scripts/presets/cycles/integrator/limited_global_illumination.py Normal file
View File

@@ -0,0 +1,11 @@
import bpy
cycles = bpy.context.scene.cycles
cycles.max_bounces = 8
cycles.min_bounces = 3
cycles.no_caustics = True
cycles.diffuse_bounces = 1
cycles.glossy_bounces = 4
cycles.transmission_bounces = 8
cycles.transparent_min_bounces = 8
cycles.transparent_max_bounces = 8

2
release/scripts/startup/bl_operators/add_mesh_torus.py
View File

@@ -86,7 +86,7 @@ class AddTorus(Operator):
'''Add a torus mesh'''
bl_idname = "mesh.primitive_torus_add"
bl_label = "Add Torus"
bl_options = {'REGISTER', 'UNDO'}
bl_options = {'REGISTER', 'UNDO', 'PRESET'}
major_radius = FloatProperty(
name="Major Radius",

5
release/scripts/startup/bl_operators/presets.py
View File

@@ -395,9 +395,8 @@ class AddPresetOperator(AddPresetBase, Operator):
options={'HIDDEN'},
)
# XXX, not ideal
preset_defines = [
"op = bpy.context.space_data.operator",
"op = bpy.context.active_operator",
]
@property
@@ -432,7 +431,7 @@ class WM_MT_operator_presets(Menu):
bl_label = "Operator Presets"
def draw(self, context):
self.operator = context.space_data.operator.bl_idname
self.operator = context.active_operator.bl_idname
Menu.draw_preset(self, context)
@property