2009-11-01 15:21:20 +00:00
|
|
|
# ##### BEGIN GPL LICENSE BLOCK #####
|
2012-12-19 12:30:39 +00:00
|
|
|
|
2009-11-01 15:21:20 +00:00
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or
|
|
|
|
# modify it under the terms of the GNU General Public License
|
|
|
|
# as published by the Free Software Foundation; either version 2
|
|
|
|
# of the License, or (at your option) any later version.
|
2009-11-03 07:23:02 +00:00
|
|
|
#
|
2009-11-01 15:21:20 +00:00
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
2009-11-03 07:23:02 +00:00
|
|
|
#
|
2009-11-01 15:21:20 +00:00
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
2009-11-01 15:21:20 +00:00
|
|
|
#
|
|
|
|
# ##### END GPL LICENSE BLOCK #####
|
2009-10-31 20:16:59 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
# <pep8 compliant>
|
2009-10-14 14:07:32 +00:00
|
|
|
import bpy
|
2011-08-12 06:57:00 +00:00
|
|
|
from bpy.types import Menu, Panel
|
2009-10-14 14:07:32 +00:00
|
|
|
|
2009-11-14 13:35:44 +00:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_MT_presets(Menu):
|
2009-11-21 21:39:20 +00:00
|
|
|
bl_label = "Render Presets"
|
2009-11-22 11:23:19 +00:00
|
|
|
preset_subdir = "render"
|
* Interaction Presets
This adds a new presets menu in the splash screen and the Input section of
User Preferences to choose a preset interaction style, consisting of key configurations
and also other user preferences such as select mouse button, view rotation style, etc.
Currently, just 'Blender' and 'Maya' presets are included, hopefully we can have more
presets contributed (and maintained!) by the community.
It's best to keep these presets minimal to avoid too many key conflicts. In the Maya one
I changed the view manipulation key/mouse combos and also the transform
manipulator keys, not much more than that.
To save an interaction preset, open the user preferences Input section, and press the
[ + ] button next to the presets menu. It will save out a .py file containing any edited key
maps and navigation preferences to the presets/interaction folder in your scripts folder.
---
Part of this commit changes the way that key maps are exported/displayed in
preferences - now partial key configs are allowed. Previously it would export/import the
entire key configuration, regardless of whether individual key maps were edited or not
(which would make them more susceptible to conflicts in unexpected areas).
(note, in blender terminology, a key map is a category of key items, such as
'Object Mode' or 'View 2d'.)
Now, the export and the UI display work in a similar way to how key maps are
processed internally - Locally edited key maps (after pressing the 'Edit' button) are
processed first, falling back to other key maps in the current key config, and then falling
back to the default key config. So it's possible for a key config to only include a few
key maps, and the rest just gets pulled from the default key config. The preferences
UI display works like this too behind the scenes in deciding what to show users,
however using it is just like it was before, the complexity is hidden.
2010-04-14 06:27:50 +00:00
|
|
|
preset_operator = "script.execute_preset"
|
2011-08-12 06:57:00 +00:00
|
|
|
draw = Menu.draw_preset
|
2009-11-21 21:39:20 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_MT_ffmpeg_presets(Menu):
|
2010-03-13 00:17:52 +00:00
|
|
|
bl_label = "FFMPEG Presets"
|
|
|
|
preset_subdir = "ffmpeg"
|
|
|
|
preset_operator = "script.python_file_run"
|
2011-08-12 06:57:00 +00:00
|
|
|
draw = Menu.draw_preset
|
2010-03-13 00:17:52 +00:00
|
|
|
|
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_MT_framerate_presets(Menu):
|
2011-01-25 18:30:31 +00:00
|
|
|
bl_label = "Frame Rate Presets"
|
|
|
|
preset_subdir = "framerate"
|
|
|
|
preset_operator = "script.execute_preset"
|
2011-08-12 06:57:00 +00:00
|
|
|
draw = Menu.draw_preset
|
2011-02-04 09:27:25 +00:00
|
|
|
|
|
|
|
|
2010-08-02 02:55:12 +00:00
|
|
|
class RenderButtonsPanel():
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_space_type = 'PROPERTIES'
|
|
|
|
bl_region_type = 'WINDOW'
|
|
|
|
bl_context = "render"
|
|
|
|
# COMPAT_ENGINES must be defined in each subclass, external engines can add themselves here
|
|
|
|
|
2010-08-09 01:37:09 +00:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2012-12-20 07:57:26 +00:00
|
|
|
scene = context.scene
|
|
|
|
return scene and (scene.render.engine in cls.COMPAT_ENGINES)
|
|
|
|
|
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_PT_render(RenderButtonsPanel, Panel):
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Render"
|
2009-12-13 16:20:18 +00:00
|
|
|
COMPAT_ENGINES = {'BLENDER_RENDER'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
2009-10-14 14:07:32 +00:00
|
|
|
|
2010-02-23 12:48:35 +00:00
|
|
|
rd = context.scene.render
|
2009-10-14 14:07:32 +00:00
|
|
|
|
2012-09-23 18:50:56 +00:00
|
|
|
row = layout.row(align=True)
|
|
|
|
row.operator("render.render", text="Render", icon='RENDER_STILL')
|
2011-09-21 15:18:38 +00:00
|
|
|
row.operator("render.render", text="Animation", icon='RENDER_ANIMATION').animation = True
|
2013-11-07 13:32:32 +00:00
|
|
|
row.operator("sound.mixdown", text="Audio", icon='PLAY_AUDIO')
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2013-12-14 08:14:33 +00:00
|
|
|
layout.prop(rd, "display_mode", text="Display")
|
2009-10-14 14:07:32 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_PT_dimensions(RenderButtonsPanel, Panel):
|
2011-06-06 20:04:58 +00:00
|
|
|
bl_label = "Dimensions"
|
|
|
|
COMPAT_ENGINES = {'BLENDER_RENDER'}
|
|
|
|
|
2013-05-29 14:55:06 +00:00
|
|
|
_frame_rate_args_prev = None
|
|
|
|
_preset_class = None
|
2013-06-27 03:05:19 +00:00
|
|
|
|
2013-05-29 14:55:06 +00:00
|
|
|
@staticmethod
|
|
|
|
def _draw_framerate_label(*args):
|
|
|
|
# avoids re-creating text string each draw
|
|
|
|
if RENDER_PT_dimensions._frame_rate_args_prev == args:
|
|
|
|
return RENDER_PT_dimensions._frame_rate_ret
|
|
|
|
|
|
|
|
fps, fps_base, preset_label = args
|
2013-06-27 03:05:19 +00:00
|
|
|
|
2013-05-29 14:55:06 +00:00
|
|
|
if fps_base == 1.0:
|
|
|
|
fps_rate = round(fps)
|
|
|
|
else:
|
|
|
|
fps_rate = round(fps / fps_base, 2)
|
|
|
|
|
|
|
|
# TODO: Change the following to iterate over existing presets
|
|
|
|
custom_framerate = (fps_rate not in {23.98, 24, 25, 29.97, 30, 50, 59.94, 60})
|
|
|
|
|
|
|
|
if custom_framerate is True:
|
|
|
|
fps_label_text = "Custom (%r fps)" % fps_rate
|
|
|
|
show_framerate = True
|
|
|
|
else:
|
|
|
|
fps_label_text = "%r fps" % fps_rate
|
|
|
|
show_framerate = (preset_label == "Custom")
|
|
|
|
|
|
|
|
RENDER_PT_dimensions._frame_rate_args_prev = args
|
|
|
|
RENDER_PT_dimensions._frame_rate_ret = args = (fps_label_text, show_framerate)
|
|
|
|
return args
|
|
|
|
|
|
|
|
@staticmethod
|
|
|
|
def draw_framerate(sub, rd):
|
|
|
|
if RENDER_PT_dimensions._preset_class is None:
|
|
|
|
RENDER_PT_dimensions._preset_class = bpy.types.RENDER_MT_framerate_presets
|
|
|
|
|
|
|
|
args = rd.fps, rd.fps_base, RENDER_PT_dimensions._preset_class.bl_label
|
|
|
|
fps_label_text, show_framerate = RENDER_PT_dimensions._draw_framerate_label(*args)
|
|
|
|
|
|
|
|
sub.menu("RENDER_MT_framerate_presets", text=fps_label_text)
|
|
|
|
|
|
|
|
if show_framerate:
|
|
|
|
sub.prop(rd, "fps")
|
|
|
|
sub.prop(rd, "fps_base", text="/")
|
|
|
|
|
2011-06-06 20:04:58 +00:00
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
scene = context.scene
|
|
|
|
rd = scene.render
|
|
|
|
|
|
|
|
row = layout.row(align=True)
|
|
|
|
row.menu("RENDER_MT_presets", text=bpy.types.RENDER_MT_presets.bl_label)
|
2011-11-08 01:32:34 +00:00
|
|
|
row.operator("render.preset_add", text="", icon='ZOOMIN')
|
|
|
|
row.operator("render.preset_add", text="", icon='ZOOMOUT').remove_active = True
|
2011-06-06 20:04:58 +00:00
|
|
|
|
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
sub = col.column(align=True)
|
2011-09-21 15:18:38 +00:00
|
|
|
sub.label(text="Resolution:")
|
2011-06-06 20:04:58 +00:00
|
|
|
sub.prop(rd, "resolution_x", text="X")
|
|
|
|
sub.prop(rd, "resolution_y", text="Y")
|
|
|
|
sub.prop(rd, "resolution_percentage", text="")
|
|
|
|
|
2011-09-21 15:18:38 +00:00
|
|
|
sub.label(text="Aspect Ratio:")
|
2011-06-06 20:04:58 +00:00
|
|
|
sub.prop(rd, "pixel_aspect_x", text="X")
|
|
|
|
sub.prop(rd, "pixel_aspect_y", text="Y")
|
|
|
|
|
|
|
|
row = col.row()
|
2011-09-21 15:18:38 +00:00
|
|
|
row.prop(rd, "use_border", text="Border")
|
2011-06-06 20:04:58 +00:00
|
|
|
sub = row.row()
|
|
|
|
sub.active = rd.use_border
|
2011-09-21 15:18:38 +00:00
|
|
|
sub.prop(rd, "use_crop_to_border", text="Crop")
|
2011-06-06 20:04:58 +00:00
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
sub = col.column(align=True)
|
2011-09-21 15:18:38 +00:00
|
|
|
sub.label(text="Frame Range:")
|
2011-09-15 13:20:18 +00:00
|
|
|
sub.prop(scene, "frame_start")
|
|
|
|
sub.prop(scene, "frame_end")
|
|
|
|
sub.prop(scene, "frame_step")
|
2011-06-06 20:04:58 +00:00
|
|
|
|
2011-09-21 15:18:38 +00:00
|
|
|
sub.label(text="Frame Rate:")
|
2011-06-06 20:04:58 +00:00
|
|
|
|
2013-05-29 14:55:06 +00:00
|
|
|
self.draw_framerate(sub, rd)
|
2011-06-06 20:04:58 +00:00
|
|
|
|
|
|
|
subrow = sub.row(align=True)
|
2011-09-21 15:18:38 +00:00
|
|
|
subrow.label(text="Time Remapping:")
|
2011-06-06 20:04:58 +00:00
|
|
|
subrow = sub.row(align=True)
|
2011-09-21 15:18:38 +00:00
|
|
|
subrow.prop(rd, "frame_map_old", text="Old")
|
|
|
|
subrow.prop(rd, "frame_map_new", text="New")
|
2011-06-06 20:04:58 +00:00
|
|
|
|
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_PT_antialiasing(RenderButtonsPanel, Panel):
|
2011-06-06 20:04:58 +00:00
|
|
|
bl_label = "Anti-Aliasing"
|
|
|
|
COMPAT_ENGINES = {'BLENDER_RENDER'}
|
|
|
|
|
|
|
|
def draw_header(self, context):
|
|
|
|
rd = context.scene.render
|
|
|
|
|
|
|
|
self.layout.prop(rd, "use_antialiasing", text="")
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
rd = context.scene.render
|
|
|
|
layout.active = rd.use_antialiasing
|
|
|
|
|
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
col.row().prop(rd, "antialiasing_samples", expand=True)
|
|
|
|
sub = col.row()
|
|
|
|
sub.enabled = not rd.use_border
|
|
|
|
sub.prop(rd, "use_full_sample")
|
|
|
|
|
|
|
|
col = split.column()
|
|
|
|
col.prop(rd, "pixel_filter_type", text="")
|
2011-09-21 15:18:38 +00:00
|
|
|
col.prop(rd, "filter_size", text="Size")
|
2011-06-06 20:04:58 +00:00
|
|
|
|
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_PT_motion_blur(RenderButtonsPanel, Panel):
|
2011-06-06 20:04:58 +00:00
|
|
|
bl_label = "Sampled Motion Blur"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
COMPAT_ENGINES = {'BLENDER_RENDER'}
|
|
|
|
|
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
|
|
|
rd = context.scene.render
|
|
|
|
return not rd.use_full_sample and (rd.engine in cls.COMPAT_ENGINES)
|
|
|
|
|
|
|
|
def draw_header(self, context):
|
|
|
|
rd = context.scene.render
|
|
|
|
|
|
|
|
self.layout.prop(rd, "use_motion_blur", text="")
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
rd = context.scene.render
|
|
|
|
layout.active = rd.use_motion_blur
|
|
|
|
|
|
|
|
row = layout.row()
|
|
|
|
row.prop(rd, "motion_blur_samples")
|
|
|
|
row.prop(rd, "motion_blur_shutter")
|
|
|
|
|
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_PT_shading(RenderButtonsPanel, Panel):
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Shading"
|
2011-06-06 20:04:58 +00:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2009-12-13 16:20:18 +00:00
|
|
|
COMPAT_ENGINES = {'BLENDER_RENDER'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2010-02-23 12:48:35 +00:00
|
|
|
rd = context.scene.render
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
2011-09-21 15:18:38 +00:00
|
|
|
col.prop(rd, "use_textures", text="Textures")
|
|
|
|
col.prop(rd, "use_shadows", text="Shadows")
|
|
|
|
col.prop(rd, "use_sss", text="Subsurface Scattering")
|
|
|
|
col.prop(rd, "use_envmaps", text="Environment Map")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
col = split.column()
|
2011-09-21 15:18:38 +00:00
|
|
|
col.prop(rd, "use_raytrace", text="Ray Tracing")
|
|
|
|
col.prop(rd, "alpha_mode", text="Alpha")
|
2009-10-14 14:07:32 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_PT_performance(RenderButtonsPanel, Panel):
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Performance"
|
2010-08-26 01:05:37 +00:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2009-12-13 16:20:18 +00:00
|
|
|
COMPAT_ENGINES = {'BLENDER_RENDER'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2010-02-23 12:48:35 +00:00
|
|
|
rd = context.scene.render
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
split = layout.split()
|
|
|
|
|
2013-08-23 20:41:21 +00:00
|
|
|
col = split.column(align=True)
|
|
|
|
col.label(text="Threads:")
|
|
|
|
col.row(align=True).prop(rd, "threads_mode", expand=True)
|
2012-11-04 01:05:25 +00:00
|
|
|
sub = col.column(align=True)
|
2013-08-23 20:41:21 +00:00
|
|
|
sub.enabled = rd.threads_mode == 'FIXED'
|
|
|
|
sub.prop(rd, "threads")
|
2013-01-15 23:15:32 +00:00
|
|
|
|
2013-08-23 20:41:21 +00:00
|
|
|
col.label(text="Tile Size:")
|
|
|
|
col.prop(rd, "tile_x", text="X")
|
|
|
|
col.prop(rd, "tile_y", text="Y")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
col = split.column()
|
2011-09-21 15:18:38 +00:00
|
|
|
col.label(text="Memory:")
|
2009-10-31 19:31:45 +00:00
|
|
|
sub = col.column()
|
2010-08-18 04:10:23 +00:00
|
|
|
sub.enabled = not (rd.use_border or rd.use_full_sample)
|
|
|
|
sub.prop(rd, "use_save_buffers")
|
2009-10-31 19:31:45 +00:00
|
|
|
sub = col.column()
|
|
|
|
sub.active = rd.use_compositing
|
2010-08-18 04:10:23 +00:00
|
|
|
sub.prop(rd, "use_free_image_textures")
|
2010-12-05 14:13:57 +00:00
|
|
|
sub.prop(rd, "use_free_unused_nodes")
|
2009-10-31 19:31:45 +00:00
|
|
|
sub = col.column()
|
2010-08-18 04:10:23 +00:00
|
|
|
sub.active = rd.use_raytrace
|
2011-09-21 15:18:38 +00:00
|
|
|
sub.label(text="Acceleration structure:")
|
2010-08-18 04:10:23 +00:00
|
|
|
sub.prop(rd, "raytrace_method", text="")
|
|
|
|
if rd.raytrace_method == 'OCTREE':
|
2011-09-21 15:18:38 +00:00
|
|
|
sub.prop(rd, "octree_resolution", text="Resolution")
|
2009-10-31 19:31:45 +00:00
|
|
|
else:
|
2011-09-21 15:18:38 +00:00
|
|
|
sub.prop(rd, "use_instances", text="Instances")
|
|
|
|
sub.prop(rd, "use_local_coords", text="Local Coordinates")
|
2009-10-14 14:07:32 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_PT_post_processing(RenderButtonsPanel, Panel):
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Post Processing"
|
2010-08-26 01:05:37 +00:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2009-12-13 16:20:18 +00:00
|
|
|
COMPAT_ENGINES = {'BLENDER_RENDER'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2010-02-23 12:48:35 +00:00
|
|
|
rd = context.scene.render
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
2009-11-23 00:27:30 +00:00
|
|
|
col.prop(rd, "use_compositing")
|
|
|
|
col.prop(rd, "use_sequencer")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2011-09-21 15:18:38 +00:00
|
|
|
split.prop(rd, "dither_intensity", text="Dither", slider=True)
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2009-11-23 00:27:30 +00:00
|
|
|
layout.separator()
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
2011-09-21 15:18:38 +00:00
|
|
|
col.prop(rd, "use_fields", text="Fields")
|
2009-10-31 19:31:45 +00:00
|
|
|
sub = col.column()
|
2010-08-18 04:10:23 +00:00
|
|
|
sub.active = rd.use_fields
|
2009-11-23 00:27:30 +00:00
|
|
|
sub.row().prop(rd, "field_order", expand=True)
|
2011-09-21 15:18:38 +00:00
|
|
|
sub.prop(rd, "use_fields_still", text="Still")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2014-01-27 18:58:54 +00:00
|
|
|
col = split.column()
|
|
|
|
col.prop(rd, "use_edge_enhance")
|
|
|
|
sub = col.column()
|
|
|
|
sub.active = rd.use_edge_enhance
|
|
|
|
sub.prop(rd, "edge_threshold", text="Threshold", slider=True)
|
|
|
|
sub.prop(rd, "edge_color", text="")
|
|
|
|
|
2009-11-03 09:15:21 +00:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_PT_stamp(RenderButtonsPanel, Panel):
|
2011-06-06 20:04:58 +00:00
|
|
|
bl_label = "Stamp"
|
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
|
|
|
COMPAT_ENGINES = {'BLENDER_RENDER'}
|
|
|
|
|
|
|
|
def draw_header(self, context):
|
|
|
|
rd = context.scene.render
|
|
|
|
|
|
|
|
self.layout.prop(rd, "use_stamp", text="")
|
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
|
|
|
rd = context.scene.render
|
|
|
|
|
|
|
|
layout.active = rd.use_stamp
|
2012-01-17 17:57:20 +00:00
|
|
|
|
2012-01-05 23:49:57 +00:00
|
|
|
layout.prop(rd, "stamp_font_size", text="Font Size")
|
2012-01-17 17:57:20 +00:00
|
|
|
|
2012-01-05 23:49:57 +00:00
|
|
|
row = layout.row()
|
|
|
|
row.column().prop(rd, "stamp_foreground", slider=True)
|
|
|
|
row.column().prop(rd, "stamp_background", slider=True)
|
2011-06-06 20:04:58 +00:00
|
|
|
|
|
|
|
split = layout.split()
|
|
|
|
|
|
|
|
col = split.column()
|
2011-09-21 15:18:38 +00:00
|
|
|
col.prop(rd, "use_stamp_time", text="Time")
|
|
|
|
col.prop(rd, "use_stamp_date", text="Date")
|
|
|
|
col.prop(rd, "use_stamp_render_time", text="RenderTime")
|
|
|
|
col.prop(rd, "use_stamp_frame", text="Frame")
|
|
|
|
col.prop(rd, "use_stamp_scene", text="Scene")
|
2012-01-17 17:57:20 +00:00
|
|
|
|
2012-01-05 23:49:57 +00:00
|
|
|
col = split.column()
|
2011-09-21 15:18:38 +00:00
|
|
|
col.prop(rd, "use_stamp_camera", text="Camera")
|
|
|
|
col.prop(rd, "use_stamp_lens", text="Lens")
|
|
|
|
col.prop(rd, "use_stamp_filename", text="Filename")
|
|
|
|
col.prop(rd, "use_stamp_marker", text="Marker")
|
|
|
|
col.prop(rd, "use_stamp_sequencer_strip", text="Seq. Strip")
|
2011-06-06 20:04:58 +00:00
|
|
|
|
|
|
|
row = layout.split(percentage=0.2)
|
2011-09-21 15:18:38 +00:00
|
|
|
row.prop(rd, "use_stamp_note", text="Note")
|
2011-06-06 20:04:58 +00:00
|
|
|
sub = row.row()
|
|
|
|
sub.active = rd.use_stamp_note
|
|
|
|
sub.prop(rd, "stamp_note_text", text="")
|
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_PT_output(RenderButtonsPanel, Panel):
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Output"
|
2009-12-13 16:20:18 +00:00
|
|
|
COMPAT_ENGINES = {'BLENDER_RENDER'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2010-02-23 12:48:35 +00:00
|
|
|
rd = context.scene.render
|
2011-11-21 20:19:58 +00:00
|
|
|
image_settings = rd.image_settings
|
2011-12-05 23:05:16 +00:00
|
|
|
file_format = image_settings.file_format
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-18 04:10:23 +00:00
|
|
|
layout.prop(rd, "filepath", text="")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2013-03-18 16:01:13 +00:00
|
|
|
split = layout.split()
|
2013-03-28 19:33:14 +00:00
|
|
|
|
2013-03-18 16:01:13 +00:00
|
|
|
col = split.column()
|
2013-03-18 16:17:45 +00:00
|
|
|
col.active = not rd.is_movie_format
|
2013-03-18 16:01:13 +00:00
|
|
|
col.prop(rd, "use_overwrite")
|
|
|
|
col.prop(rd, "use_placeholder")
|
2013-03-28 19:33:14 +00:00
|
|
|
|
2013-03-18 16:01:13 +00:00
|
|
|
split.prop(rd, "use_file_extension")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
layout.template_image_settings(image_settings, color_management=False)
|
2009-10-14 14:07:32 +00:00
|
|
|
|
2013-11-06 01:45:15 +00:00
|
|
|
if file_format == 'QUICKTIME':
|
2012-01-13 12:34:41 +00:00
|
|
|
quicktime = rd.quicktime
|
|
|
|
|
2009-11-24 09:46:53 +00:00
|
|
|
split = layout.split()
|
|
|
|
col = split.column()
|
2012-01-13 12:34:41 +00:00
|
|
|
col.prop(quicktime, "codec_type", text="Video Codec")
|
|
|
|
col.prop(quicktime, "codec_spatial_quality", text="Quality")
|
2009-10-14 14:07:32 +00:00
|
|
|
|
2010-04-17 19:05:53 +00:00
|
|
|
# Audio
|
2012-01-13 12:34:41 +00:00
|
|
|
col.prop(quicktime, "audiocodec_type", text="Audio Codec")
|
|
|
|
if quicktime.audiocodec_type != 'No audio':
|
2010-04-10 09:31:41 +00:00
|
|
|
split = layout.split()
|
2012-01-13 12:34:41 +00:00
|
|
|
if quicktime.audiocodec_type == 'LPCM':
|
|
|
|
split.prop(quicktime, "audio_bitdepth", text="")
|
2010-08-06 15:17:44 +00:00
|
|
|
|
2012-01-13 12:34:41 +00:00
|
|
|
split.prop(quicktime, "audio_samplerate", text="")
|
2010-04-10 09:31:41 +00:00
|
|
|
|
|
|
|
split = layout.split()
|
|
|
|
col = split.column()
|
2012-01-13 12:34:41 +00:00
|
|
|
if quicktime.audiocodec_type == 'AAC':
|
|
|
|
col.prop(quicktime, "audio_bitrate")
|
2010-08-06 15:17:44 +00:00
|
|
|
|
|
|
|
subsplit = split.split()
|
|
|
|
col = subsplit.column()
|
|
|
|
|
2012-02-13 12:57:46 +00:00
|
|
|
if quicktime.audiocodec_type == 'AAC':
|
2012-01-13 12:34:41 +00:00
|
|
|
col.prop(quicktime, "audio_codec_isvbr")
|
2010-09-07 15:17:42 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
col = subsplit.column()
|
2012-01-13 12:34:41 +00:00
|
|
|
col.prop(quicktime, "audio_resampling_hq")
|
2009-11-20 10:37:50 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_PT_encoding(RenderButtonsPanel, Panel):
|
2009-10-31 19:31:45 +00:00
|
|
|
bl_label = "Encoding"
|
2010-08-26 01:05:37 +00:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
2009-12-13 16:20:18 +00:00
|
|
|
COMPAT_ENGINES = {'BLENDER_RENDER'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-09 01:37:09 +00:00
|
|
|
@classmethod
|
|
|
|
def poll(cls, context):
|
2010-02-23 12:48:35 +00:00
|
|
|
rd = context.scene.render
|
2011-11-21 20:19:58 +00:00
|
|
|
return rd.image_settings.file_format in {'FFMPEG', 'XVID', 'H264', 'THEORA'}
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2010-02-23 12:48:35 +00:00
|
|
|
rd = context.scene.render
|
2012-01-13 12:34:41 +00:00
|
|
|
ffmpeg = rd.ffmpeg
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2011-09-21 15:18:38 +00:00
|
|
|
layout.menu("RENDER_MT_ffmpeg_presets", text="Presets")
|
2010-03-13 00:17:52 +00:00
|
|
|
|
2009-10-31 19:31:45 +00:00
|
|
|
split = layout.split()
|
2012-01-13 12:34:41 +00:00
|
|
|
split.prop(rd.ffmpeg, "format")
|
|
|
|
if ffmpeg.format in {'AVI', 'QUICKTIME', 'MKV', 'OGG'}:
|
|
|
|
split.prop(ffmpeg, "codec")
|
|
|
|
elif rd.ffmpeg.format == 'H264':
|
2012-06-19 22:17:19 +00:00
|
|
|
split.prop(ffmpeg, "use_lossless_output")
|
2009-10-31 19:31:45 +00:00
|
|
|
else:
|
2010-08-06 15:17:44 +00:00
|
|
|
split.label()
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2011-02-16 20:29:23 +00:00
|
|
|
row = layout.row()
|
2012-01-13 12:34:41 +00:00
|
|
|
row.prop(ffmpeg, "video_bitrate")
|
|
|
|
row.prop(ffmpeg, "gopsize")
|
2009-11-21 00:05:43 +00:00
|
|
|
|
2009-11-20 12:26:41 +00:00
|
|
|
split = layout.split()
|
2009-10-31 19:31:45 +00:00
|
|
|
|
|
|
|
col = split.column()
|
2011-09-21 15:18:38 +00:00
|
|
|
col.label(text="Rate:")
|
2012-01-13 12:34:41 +00:00
|
|
|
col.prop(ffmpeg, "minrate", text="Minimum")
|
|
|
|
col.prop(ffmpeg, "maxrate", text="Maximum")
|
|
|
|
col.prop(ffmpeg, "buffersize", text="Buffer")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
col = split.column()
|
2012-01-13 12:34:41 +00:00
|
|
|
col.prop(ffmpeg, "use_autosplit")
|
2011-09-21 15:18:38 +00:00
|
|
|
col.label(text="Mux:")
|
2012-01-13 12:34:41 +00:00
|
|
|
col.prop(ffmpeg, "muxrate", text="Rate")
|
|
|
|
col.prop(ffmpeg, "packetsize", text="Packet Size")
|
2009-11-28 23:37:56 +00:00
|
|
|
|
2011-02-16 20:29:23 +00:00
|
|
|
layout.separator()
|
2010-02-07 23:41:17 +00:00
|
|
|
|
2009-11-28 23:37:56 +00:00
|
|
|
# Audio:
|
2012-01-14 06:30:27 +00:00
|
|
|
if ffmpeg.format != 'MP3':
|
2012-01-13 12:34:41 +00:00
|
|
|
layout.prop(ffmpeg, "audio_codec", text="Audio Codec")
|
2009-10-31 19:31:45 +00:00
|
|
|
|
2011-08-30 10:44:02 +00:00
|
|
|
row = layout.row()
|
2012-01-13 12:34:41 +00:00
|
|
|
row.prop(ffmpeg, "audio_bitrate")
|
|
|
|
row.prop(ffmpeg, "audio_volume", slider=True)
|
2009-10-14 14:07:32 +00:00
|
|
|
|
2009-10-31 23:35:56 +00:00
|
|
|
|
2011-08-12 06:57:00 +00:00
|
|
|
class RENDER_PT_bake(RenderButtonsPanel, Panel):
|
2009-12-29 18:55:38 +00:00
|
|
|
bl_label = "Bake"
|
2010-08-26 01:05:37 +00:00
|
|
|
bl_options = {'DEFAULT_CLOSED'}
|
Cucumber, first batch of merge - UI changes and custom exit key
---------------------------------------------------------------
This was a test drive to see how painful the merge will be.
Next batches are:
- use desktop option for fullscreen
- multisampling option
- bullet collision mask
- python
- storage (vbo, dl, ...)
- lighting
[lighting still needs review]
[python could use review, although it should be straightforward]
[storage should be tested more I think]
Merged /branches/soc-2011-cucumber:r
36991,37059,37157,37416,37497-37499,37501,37522,39036,40593
36991:
==UI==
* Made some options available in Blender Game that were only available in Blender Render (camera resolution, animation fps)
* Created a panel for the embedded player
* Renamed the FPS option for the standalone player to Refresh Rate
* Moved framing options to display
* Made a button to launch the blender player from within blender (only tested on windows for now)
37059:
==UI==
* Added the option to change the exit key for the BGE. The UI currently just sets a number, and this feature most likely does not work for blenderplayer yet. More work on this to come.
* Removed the physics settings from the scene panel for the BGE.
* Added an Add menu in the logic brick header.
37157:
Making the bake options available in Blender Game
37416:
Making the exit key UI element accept key presses instead of numbers. It still does not work for the Blenderplayer, and it does not limit the input to key presses (other events don't work for exiting)
37497:
Some more work on getting the exit key to work in the Blenderplayer.
Input is now restricted to keyboard events only for the exit key UI.
37498:
Some clean up from the last commit.
The exit key setting affects the Blenderplayer now.
37499:
Cleaning up some duplicate code. Now the reverseTranslateTable for converting blender key codes to ketsji key codes is only defined in BL_BlenderDataConverter.
37501:
Centralizing the exit key methods to the keyboard devices. This should make it easier to get exit key control to the python API.
[37517: committed previously]
37522:
Moved control of the exit key away from the keyboard devices, and moved it to ketsjiengine.
Added setExitKey and getExitKey to the python API
39036:
A couple of the doversions were in the wrong spot. This should fix some issues with the exit key not being set.
[not committed entirely, see below]]
40552: space_logic.py (* fixed an error in space_logic.py *)
40593:
launch blenderplayer from ui not working in OSX fix - by Daniel Stokes and me
########################################################
code left behind (to be included in next commit):
########################################################
{
/* Initialize default values for collision masks */
Object *ob;
for(ob=main->object.first; ob; ob=ob->id.next)
ob->col_group = ob->col_mask = 1;
}
2011-12-20 03:11:56 +00:00
|
|
|
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
|
2009-12-29 18:55:38 +00:00
|
|
|
|
|
|
|
def draw(self, context):
|
|
|
|
layout = self.layout
|
|
|
|
|
2010-02-23 12:48:35 +00:00
|
|
|
rd = context.scene.render
|
2009-10-14 14:07:32 +00:00
|
|
|
|
2010-01-01 22:32:07 +00:00
|
|
|
layout.operator("object.bake_image", icon='RENDER_STILL')
|
2010-01-31 14:46:28 +00:00
|
|
|
|
2010-08-06 15:17:44 +00:00
|
|
|
layout.prop(rd, "bake_type")
|
2010-01-31 14:46:28 +00:00
|
|
|
|
2011-06-05 20:54:04 +00:00
|
|
|
multires_bake = False
|
2013-10-09 15:51:14 +00:00
|
|
|
if rd.bake_type in ['NORMALS', 'DISPLACEMENT', 'DERIVATIVE', 'AO']:
|
2012-06-19 22:17:19 +00:00
|
|
|
layout.prop(rd, "use_bake_multires")
|
2011-06-05 20:54:04 +00:00
|
|
|
multires_bake = rd.use_bake_multires
|
2010-01-31 14:46:28 +00:00
|
|
|
|
2011-06-05 20:54:04 +00:00
|
|
|
if not multires_bake:
|
|
|
|
if rd.bake_type == 'NORMALS':
|
|
|
|
layout.prop(rd, "bake_normal_space")
|
|
|
|
elif rd.bake_type in {'DISPLACEMENT', 'AO'}:
|
|
|
|
layout.prop(rd, "use_bake_normalize")
|
2010-01-31 14:46:28 +00:00
|
|
|
|
2011-06-05 20:54:04 +00:00
|
|
|
# col.prop(rd, "bake_aa_mode")
|
|
|
|
# col.prop(rd, "use_bake_antialiasing")
|
2010-01-31 14:46:28 +00:00
|
|
|
|
2011-06-05 20:54:04 +00:00
|
|
|
layout.separator()
|
2010-01-31 14:46:28 +00:00
|
|
|
|
2011-06-05 20:54:04 +00:00
|
|
|
split = layout.split()
|
2009-12-29 18:55:38 +00:00
|
|
|
|
2011-06-05 20:54:04 +00:00
|
|
|
col = split.column()
|
2013-01-02 00:05:30 +00:00
|
|
|
col.prop(rd, "use_bake_to_vertex_color")
|
|
|
|
sub = col.column()
|
|
|
|
sub.active = not rd.use_bake_to_vertex_color
|
|
|
|
sub.prop(rd, "use_bake_clear")
|
|
|
|
sub.prop(rd, "bake_margin")
|
|
|
|
sub.prop(rd, "bake_quad_split", text="Split")
|
2010-01-31 14:46:28 +00:00
|
|
|
|
2011-06-05 20:54:04 +00:00
|
|
|
col = split.column()
|
|
|
|
col.prop(rd, "use_bake_selected_to_active")
|
|
|
|
sub = col.column()
|
|
|
|
sub.active = rd.use_bake_selected_to_active
|
|
|
|
sub.prop(rd, "bake_distance")
|
|
|
|
sub.prop(rd, "bake_bias")
|
|
|
|
else:
|
2012-12-18 17:46:42 +00:00
|
|
|
split = layout.split()
|
2011-06-05 20:54:04 +00:00
|
|
|
|
2012-12-18 17:46:42 +00:00
|
|
|
col = split.column()
|
|
|
|
col.prop(rd, "use_bake_clear")
|
|
|
|
col.prop(rd, "bake_margin")
|
|
|
|
|
|
|
|
if rd.bake_type == 'DISPLACEMENT':
|
|
|
|
col = split.column()
|
|
|
|
col.prop(rd, "use_bake_lores_mesh")
|
2013-10-09 15:51:14 +00:00
|
|
|
|
2012-12-18 17:46:42 +00:00
|
|
|
if rd.bake_type == 'AO':
|
|
|
|
col = split.column()
|
|
|
|
col.prop(rd, "bake_bias")
|
2012-12-19 12:30:39 +00:00
|
|
|
col.prop(rd, "bake_samples")
|
2011-04-04 10:13:04 +00:00
|
|
|
|
2013-10-09 15:51:14 +00:00
|
|
|
if rd.bake_type == 'DERIVATIVE':
|
|
|
|
row = layout.row()
|
|
|
|
row.prop(rd, "use_bake_user_scale", text="")
|
|
|
|
|
|
|
|
sub = row.column()
|
|
|
|
sub.active = rd.use_bake_user_scale
|
|
|
|
sub.prop(rd, "bake_user_scale", text="User Scale")
|
|
|
|
|
2011-04-04 10:13:04 +00:00
|
|
|
|
|
|
|
if __name__ == "__main__": # only for live edit.
|
|
|
|
bpy.utils.register_module(__name__)
|