diff options
Diffstat (limited to 'release')
4 files changed, 41 insertions, 25 deletions
diff --git a/release/scripts/presets/cycles/integrator/direct_light.py b/release/scripts/presets/cycles/integrator/direct_light.py new file mode 100644 index 00000000000..504068722d7 --- /dev/null +++ b/release/scripts/presets/cycles/integrator/direct_light.py @@ -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 diff --git a/release/scripts/presets/cycles/integrator/full_global_illumination.py b/release/scripts/presets/cycles/integrator/full_global_illumination.py new file mode 100644 index 00000000000..8687f169b8a --- /dev/null +++ b/release/scripts/presets/cycles/integrator/full_global_illumination.py @@ -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 diff --git a/release/scripts/presets/cycles/integrator/limited_global_illumination.py b/release/scripts/presets/cycles/integrator/limited_global_illumination.py new file mode 100644 index 00000000000..f2a7e1f7b7a --- /dev/null +++ b/release/scripts/presets/cycles/integrator/limited_global_illumination.py @@ -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 diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 2216d2b2170..7d0ddc73e86 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -41,7 +41,6 @@ def particle_panel_enabled(context, psys): def particle_panel_poll(cls, context): psys = context.particle_system - engine = context.scene.render.engine settings = 0 if psys: @@ -52,7 +51,7 @@ def particle_panel_poll(cls, context): if not settings: return False - return settings.is_fluid == False and (engine in cls.COMPAT_ENGINES) + return settings.is_fluid == False def particle_get_settings(context): @@ -76,21 +75,14 @@ class ParticleButtonsPanel(): class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel): bl_label = "" bl_options = {'HIDE_HEADER'} - # COMPAT_ENGINES = {'BLENDER_RENDER'} + COMPAT_ENGINES = {'BLENDER_RENDER'} @classmethod def poll(cls, context): - engine = context.scene.render.engine - return (context.particle_system or context.object or context.space_data.pin_id)# and (engine in cls.COMPAT_ENGINES) + return (context.particle_system or context.object or context.space_data.pin_id) def draw(self, context): layout = self.layout - - if context.scene.render.engine == "BLENDER_GAME": - layout.label("The Blender particle system is") - layout.label("not available for use in the") - layout.label("Blender Game Engine") - return ob = context.object psys = context.particle_system @@ -260,12 +252,11 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, Panel): @classmethod def poll(cls, context): psys = context.particle_system - engine = context.scene.render.engine if psys is None: return False if psys.settings is None: return False - return psys.settings.type == 'HAIR' and (engine in cls.COMPAT_ENGINES) + return psys.settings.type == 'HAIR' def draw_header(self, context): #cloth = context.cloth.collision_settings @@ -326,7 +317,7 @@ class PARTICLE_PT_cache(ParticleButtonsPanel, Panel): phystype = psys.settings.physics_type if phystype == 'NO' or phystype == 'KEYED': return False - return (psys.settings.type in {'EMITTER', 'REACTOR'} or (psys.settings.type == 'HAIR' and (psys.use_hair_dynamics or psys.point_cache.is_baked))) and engine in cls.COMPAT_ENGINES + return (psys.settings.type in {'EMITTER', 'REACTOR'} or (psys.settings.type == 'HAIR' and (psys.use_hair_dynamics or psys.point_cache.is_baked))) def draw(self, context): psys = context.particle_system @@ -669,13 +660,12 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, Panel): def poll(cls, context): psys = context.particle_system settings = particle_get_settings(context) - engine = context.scene.render.engine if settings is None: return False if psys is not None and psys.point_cache.use_external: return False - return settings.physics_type == 'BOIDS' and engine in cls.COMPAT_ENGINES + return settings.physics_type == 'BOIDS' def draw(self, context): layout = self.layout @@ -769,11 +759,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, Panel): @classmethod def poll(cls, context): settings = particle_get_settings(context) - engine = context.scene.render.engine - if settings is None: - return False - - return engine in cls.COMPAT_ENGINES + return settings is not None def draw(self, context): layout = self.layout @@ -958,10 +944,7 @@ class PARTICLE_PT_draw(ParticleButtonsPanel, Panel): @classmethod def poll(cls, context): settings = particle_get_settings(context) - engine = context.scene.render.engine - if settings is None: - return False - return engine in cls.COMPAT_ENGINES + return settings is not None def draw(self, context): layout = self.layout |