diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
commit | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (patch) | |
tree | 81a2b9221799707b49b74a5df8bb3ff964ba78bd /release/scripts/startup/bl_ui | |
parent | 7afbdff1b6c348227e652e1c3071ab7ba7c91c44 (diff) | |
parent | a73dd3476e7d180d3320afc04d218ce22f2f3bfc (diff) |
Merged changes in the trunk up to revision 50829.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material). OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
Diffstat (limited to 'release/scripts/startup/bl_ui')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_mesh.py | 21 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_material.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_render.py | 13 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 26 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 51 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 3 |
6 files changed, 86 insertions, 29 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 5f21f78a375..6125540d491 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -316,10 +316,31 @@ class DATA_PT_vertex_colors(MeshButtonsPanel, Panel): layout.prop(lay, "name") +class DATA_PT_customdata(MeshButtonsPanel, Panel): + bl_label = "Geometry Data" + bl_options = {'DEFAULT_CLOSED'} + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} + + def draw(self, context): + layout = self.layout + + # me = context.mesh + col = layout.column() + # sticky has no UI access since 2.49 - we may remove + ''' + row = col.row(align=True) + row.operator("mesh.customdata_create_sticky") + row.operator("mesh.customdata_clear_sticky", icon='X') + ''' + col.operator("mesh.customdata_clear_mask", icon='X') + col.operator("mesh.customdata_clear_skin", icon='X') + + class DATA_PT_custom_props_mesh(MeshButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} _context_path = "object.data" _property_type = bpy.types.Mesh + if __name__ == "__main__": # only for live edit. bpy.utils.register_module(__name__) diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index dfc75168d2b..8eecbf4b604 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -763,6 +763,7 @@ class MATERIAL_PT_options(MaterialButtonsPanel, Panel): col.prop(mat, "use_vertex_color_paint") col.prop(mat, "use_vertex_color_light") col.prop(mat, "use_object_color") + col.prop(mat, "use_uv_project") if simple_material(base_mat): col.prop(mat, "pass_index") diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index ad5996a0b26..47689b9be73 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -63,10 +63,10 @@ class RENDER_PT_render(RenderButtonsPanel, Panel): rd = context.scene.render - row = layout.row() - row.operator("render.render", text="Image", icon='RENDER_STILL') + row = layout.row(align=True) + row.operator("render.render", text="Render", icon='RENDER_STILL') row.operator("render.render", text="Animation", icon='RENDER_ANIMATION').animation = True - row.operator("render.play_rendered_anim", text="Play", icon='RENDER_ANIMATION') + row.operator("render.play_rendered_anim", text="Play", icon='PLAY') layout.prop(rd, "display_mode", text="Display") @@ -866,10 +866,7 @@ class RENDER_PT_shading(RenderButtonsPanel, Panel): col = split.column() col.prop(rd, "use_raytrace", text="Ray Tracing") - col.prop(rd, "use_color_management") - sub = col.row() - sub.active = rd.use_color_management == True - sub.prop(rd, "use_color_unpremultiply") + col.prop(rd, "use_color_unpremultiply") col.prop(rd, "alpha_mode", text="Alpha") @@ -1031,7 +1028,7 @@ class RENDER_PT_output(RenderButtonsPanel, Panel): flow.prop(rd, "use_placeholder") flow.prop(rd, "use_file_extension") - layout.template_image_settings(image_settings) + layout.template_image_settings(image_settings, color_management=False) if file_format == 'QUICKTIME_CARBON': layout.operator("scene.render_data_set_quicktime_codec") diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 8449d26f6e6..2ccdb9cee26 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -231,6 +231,32 @@ class SCENE_PT_simplify(SceneButtonsPanel, Panel): col.prop(rd, "simplify_ao_sss", text="AO and SSS") +class SCENE_PT_color_management(Panel): + bl_label = "Color Management" + bl_space_type = 'PROPERTIES' + bl_region_type = 'WINDOW' + bl_context = "scene" + + def draw(self, context): + layout = self.layout + + scene = context.scene + + col = layout.column() + col.label(text="Display:") + col.prop(scene.display_settings, "display_device") + + col = layout.column() + col.separator() + col.label(text="Render:") + col.template_colormanaged_view_settings(scene, "view_settings") + + col = layout.column() + col.separator() + col.label(text="Sequencer:") + col.prop(scene.sequencer_colorspace_settings, "name") + + class SCENE_PT_custom_props(SceneButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} _context_path = "scene" diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index dd13b8a9b51..4a418698e26 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -83,11 +83,11 @@ class SEQUENCER_HT_header(Header): layout.separator() layout.operator("sequencer.refresh_all") - elif st.view_type == 'SEQUENCER_PREVIEW': - layout.separator() - layout.operator("sequencer.refresh_all") - layout.prop(st, "display_channel", text="Channel") else: + if st.view_type == 'SEQUENCER_PREVIEW': + layout.separator() + layout.operator("sequencer.refresh_all") + layout.prop(st, "display_channel", text="Channel") ed = context.scene.sequence_editor @@ -101,12 +101,12 @@ class SEQUENCER_HT_header(Header): row = layout.row() row.prop(st, "overlay_type", text="") - row = layout.row(align=True) - props = row.operator("render.opengl", text="", icon='RENDER_STILL') - props.sequencer = True - props = row.operator("render.opengl", text="", icon='RENDER_ANIMATION') - props.animation = True - props.sequencer = True + row = layout.row(align=True) + props = row.operator("render.opengl", text="", icon='RENDER_STILL') + props.sequencer = True + props = row.operator("render.opengl", text="", icon='RENDER_ANIMATION') + props.animation = True + props.sequencer = True layout.template_running_jobs() @@ -130,12 +130,19 @@ class SEQUENCER_MT_view(Menu): st = context.space_data + if st.view_type in {'PREVIEW'}: + # Specifying the REGION_PREVIEW context is needed in preview-only + # mode, else the lookup for the shortcut will fail in + # wm_keymap_item_find_props() (see #32595). + layout.operator_context = 'INVOKE_REGION_PREVIEW' layout.operator("sequencer.properties", icon='MENU_PANEL') + layout.operator_context = 'INVOKE_DEFAULT' layout.separator() if st.view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'}: layout.operator("sequencer.view_all", text="View all Sequences") + layout.operator("sequencer.view_selected") if st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'}: layout.operator_context = 'INVOKE_REGION_PREVIEW' layout.operator("sequencer.view_all_preview", text="Fit preview in window") @@ -145,19 +152,21 @@ class SEQUENCER_MT_view(Menu): # # XXX, invokes in the header view # layout.operator("sequencer.view_ghost_border", text="Overlay Border") - layout.operator("sequencer.view_selected") - - layout.prop(st, "show_seconds") + if st.view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'}: + layout.prop(st, "show_seconds") + layout.prop(st, "show_frame_indicator") - layout.prop(st, "show_frame_indicator") - if st.display_mode == 'IMAGE': - layout.prop(st, "show_safe_margin") - if st.display_mode == 'WAVEFORM': - layout.prop(st, "show_separate_color") + if st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'}: + if st.display_mode == 'IMAGE': + layout.prop(st, "show_safe_margin") + elif st.display_mode == 'WAVEFORM': + layout.prop(st, "show_separate_color") layout.separator() - layout.prop(st, "use_marker_sync") - layout.separator() + + if st.view_type in {'SEQUENCER', 'SEQUENCER_PREVIEW'}: + layout.prop(st, "use_marker_sync") + layout.separator() layout.operator("screen.area_dupli") layout.operator("screen.screen_full_area") @@ -884,6 +893,8 @@ class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel): strip = act_strip(context) sequencer = context.scene.sequence_editor + layout.prop(strip, "use_linear_modifiers") + layout.operator_menu_enum("sequencer.strip_modifier_add", "type") for mod in strip.modifiers: diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 30dfd5dcf43..92255275966 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -583,7 +583,7 @@ class VIEW3D_MT_select_edit_mesh(Menu): if context.scene.tool_settings.mesh_select_mode[2] == False: layout.operator("mesh.select_non_manifold", text="Non Manifold") layout.operator("mesh.select_loose_verts", text="Loose Verts/Edges") - layout.operator("mesh.select_similar", text="Similar") + layout.operator_menu_enum("mesh.select_similar", "type", text="Similar") layout.separator() @@ -722,6 +722,7 @@ class VIEW3D_MT_select_edit_armature(Menu): props.extend = True props.direction = 'CHILD' + layout.operator_menu_enum("armature.select_similar", "type", text="Similar") layout.operator("object.select_pattern", text="Select Pattern...") |