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

Merged changes in the trunk up to revision 45431.

Browse Source
This commit is contained in:
Tamito Kajiyama
2012-04-06 03:37:27 +00:00
parent 79e2cd8fdf 110a1526b6
commit 4c8febf3ea
84 changed files with 2075 additions and 1775 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
release/scripts/presets/interface_theme/back_to_black.xml
View File

@@ -11,6 +11,7 @@
bone_pose="#50c8ff"
bone_solid="#c8c8c8"
bundle_solid="#c8c8c8"
camera="#000000"
camera_path="#5a5a5a"
frame_current="#60c040"
edge_crease="#cc0099"
@@ -19,6 +20,7 @@
edge_select="#ffa000"
edge_sharp="#ff2020"
edge_facesel="#6b6b6b"
empty="#000000"
face="#73828f12"
extra_face_angle="#00c900"
extra_face_area="#fff000"
@@ -404,6 +406,7 @@
</properties>
<sequence_editor>
<ThemeSequenceEditor audio_strip="#2e8f8f"
movieclip_strip="#20208f"
frame_current="#2f5f23"
draw_action="#50c8ff"
effect_strip="#a9547c"
@@ -412,8 +415,8 @@
keyframe="#ff8500"
meta_strip="#6d9183"
movie_strip="#516987"
movieclip_strip="#20208f"
plugin_strip="#7e7e50"
preview_back="#000000"
scene_strip="#4e983e"
transition_strip="#a25f6f"
window_sliders="#a0a0a0">
@@ -688,6 +691,18 @@
text_sel="#ffffff">
</ThemeWidgetColors>
</wcol_tool>
<wcol_tooltip>
<ThemeWidgetColors inner="#191919e6"
inner_sel="#2d2d2de6"
item="#646464ff"
outline="#000000"
shadedown="-20"
shadetop="25"
show_shaded="FALSE"
text="#ffffff"
text_sel="#ffffff">
</ThemeWidgetColors>
</wcol_tooltip>
</ThemeUserInterface>
</user_interface>
<user_preferences>

27
release/scripts/presets/interface_theme/blender_24x.xml
View File

@@ -11,6 +11,7 @@
bone_pose="#50c8ff"
bone_solid="#c8c8c8"
bundle_solid="#c8c8c8"
camera="#000000"
camera_path="#000000"
frame_current="#60c040"
edge_crease="#cc0099"
@@ -19,6 +20,7 @@
edge_select="#cece38"
edge_sharp="#ff2020"
edge_facesel="#4b4b4b"
empty="#000000"
face="#0032961e"
extra_face_angle="#000080"
extra_face_area="#002000"
@@ -155,10 +157,10 @@
</dopesheet_editor>
<file_browser>
<ThemeFileBrowser active_file="#828282"
active_file_text="#fafafa"
active_file_text="#ffffff"
scroll_handle="#7f7070"
scrollbar="#a0a0a0"
selected_file="#7f7f7f"
selected_file="#a0a0d0"
tiles="#b4b4b4">
<space>
<ThemeSpaceGeneric header="#b4b4b4"
@@ -171,7 +173,7 @@
text="#000000"
text_hi="#0f0f0f"
title="#000000"
back="#b4b4b4">
back="#808080">
</ThemeSpaceGeneric>
</space>
<space_list>
@@ -260,7 +262,7 @@
text="#000000"
text_hi="#ffffff"
title="#000000"
back="#757575">
back="#353535">
</ThemeSpaceGeneric>
</space>
</ThemeImageEditor>
@@ -379,7 +381,7 @@
text="#000000"
text_hi="#ffffff"
title="#000000"
back="#b4b4b4">
back="#999999">
</ThemeSpaceGeneric>
</space>
</ThemeOutliner>
@@ -404,6 +406,7 @@
</properties>
<sequence_editor>
<ThemeSequenceEditor audio_strip="#2e8f8f"
movieclip_strip="#20208f"
frame_current="#60c040"
draw_action="#50c8ff"
effect_strip="#a9547c"
@@ -412,8 +415,8 @@
keyframe="#ff8500"
meta_strip="#6d9183"
movie_strip="#516987"
movieclip_strip="#20208f"
plugin_strip="#7e7e50"
preview_back="#000000"
scene_strip="#4e983e"
transition_strip="#a25f6f"
window_sliders="#a0a0a0">
@@ -688,6 +691,18 @@
text_sel="#ffffff">
</ThemeWidgetColors>
</wcol_tool>
<wcol_tooltip>
<ThemeWidgetColors inner="#ffffddff"
inner_sel="#2d2d2de6"
item="#646464ff"
outline="#000000"
shadedown="-20"
shadetop="25"
show_shaded="FALSE"
text="#000000"
text_sel="#ffffff">
</ThemeWidgetColors>
</wcol_tooltip>
</ThemeUserInterface>
</user_interface>
<user_preferences>

17
release/scripts/presets/interface_theme/elsyiun.xml
View File

@@ -11,6 +11,7 @@
bone_pose="#50c8ff"
bone_solid="#c8c8c8"
bundle_solid="#c8c8c8"
camera="#000000"
camera_path="#000000"
frame_current="#60c040"
edge_crease="#cc0099"
@@ -19,6 +20,7 @@
edge_select="#cb7027"
edge_sharp="#00ffff"
edge_facesel="#4b4b4b"
empty="#000000"
face="#00000036"
extra_face_angle="#000080"
extra_face_area="#002000"
@@ -404,6 +406,7 @@
</properties>
<sequence_editor>
<ThemeSequenceEditor audio_strip="#2e8f8f"
movieclip_strip="#20208f"
frame_current="#60c040"
draw_action="#50c8ff"
effect_strip="#a9547c"
@@ -412,8 +415,8 @@
keyframe="#ff8500"
meta_strip="#6d9183"
movie_strip="#516987"
movieclip_strip="#20208f"
plugin_strip="#7e7e50"
preview_back="#000000"
scene_strip="#4e983e"
transition_strip="#a25f6f"
window_sliders="#a0a0a0">
@@ -688,6 +691,18 @@
text_sel="#ffffff">
</ThemeWidgetColors>
</wcol_tool>
<wcol_tooltip>
<ThemeWidgetColors inner="#191919e6"
inner_sel="#2d2d2de6"
item="#646464ff"
outline="#000000"
shadedown="-20"
shadetop="25"
show_shaded="FALSE"
text="#ffffff"
text_sel="#ffffff">
</ThemeWidgetColors>
</wcol_tooltip>
</ThemeUserInterface>
</user_interface>
<user_preferences>

17
release/scripts/presets/interface_theme/hexagon.xml
View File

@@ -11,6 +11,7 @@
bone_pose="#50c8ff"
bone_solid="#c8c8c8"
bundle_solid="#c8c8c8"
camera="#000000"
camera_path="#000000"
frame_current="#60c040"
edge_crease="#cc0099"
@@ -19,6 +20,7 @@
edge_select="#1151ce"
edge_sharp="#ff2020"
edge_facesel="#4b4b4b"
empty="#000000"
face="#affff418"
extra_face_angle="#00008a"
extra_face_area="#002000"
@@ -404,6 +406,7 @@
</properties>
<sequence_editor>
<ThemeSequenceEditor audio_strip="#2e8f8f"
movieclip_strip="#20208f"
frame_current="#60c040"
draw_action="#50c8ff"
effect_strip="#a9547c"
@@ -412,8 +415,8 @@
keyframe="#ff8500"
meta_strip="#6d9183"
movie_strip="#516987"
movieclip_strip="#20208f"
plugin_strip="#7e7e50"
preview_back="#000000"
scene_strip="#4e983e"
transition_strip="#a25f6f"
window_sliders="#a0a0a0">
@@ -688,6 +691,18 @@
text_sel="#ffffff">
</ThemeWidgetColors>
</wcol_tool>
<wcol_tooltip>
<ThemeWidgetColors inner="#191919e6"
inner_sel="#2d2d2de6"
item="#646464ff"
outline="#000000"
shadedown="-20"
shadetop="25"
show_shaded="FALSE"
text="#ffffff"
text_sel="#ffffff">
</ThemeWidgetColors>
</wcol_tooltip>
</ThemeUserInterface>
</user_interface>
<user_preferences>

17
release/scripts/presets/interface_theme/ubuntu_ambiance.xml
View File

@@ -11,6 +11,7 @@
bone_pose="#50c8ff"
bone_solid="#c8c8c8"
bundle_solid="#c8c8c8"
camera="#000000"
camera_path="#000000"
frame_current="#60c040"
edge_crease="#ce33b8"
@@ -19,6 +20,7 @@
edge_select="#f68d46"
edge_sharp="#ff4c00"
edge_facesel="#4b4b4b"
empty="#000000"
face="#75757512"
extra_face_angle="#002000"
extra_face_area="#0059ee"
@@ -404,6 +406,7 @@
</properties>
<sequence_editor>
<ThemeSequenceEditor audio_strip="#2e8f8f"
movieclip_strip="#20208f"
frame_current="#c06e11"
draw_action="#50c8ff"
effect_strip="#a9547c"
@@ -412,8 +415,8 @@
keyframe="#f47421"
meta_strip="#6d9183"
movie_strip="#516987"
movieclip_strip="#20208f"
plugin_strip="#7e7e50"
preview_back="#000000"
scene_strip="#4e983e"
transition_strip="#a25f6f"
window_sliders="#a0a0a0">
@@ -688,6 +691,18 @@
text_sel="#f47421">
</ThemeWidgetColors>
</wcol_tool>
<wcol_tooltip>
<ThemeWidgetColors inner="#191919e6"
inner_sel="#2d2d2de6"
item="#646464ff"
outline="#000000"
shadedown="-20"
shadetop="25"
show_shaded="FALSE"
text="#ffffff"
text_sel="#ffffff">
</ThemeWidgetColors>
</wcol_tooltip>
</ThemeUserInterface>
</user_interface>
<user_preferences>

2
release/scripts/startup/bl_ui/properties_data_armature.py
View File

@@ -289,7 +289,7 @@ class DATA_PT_iksolver_itasc(ArmatureButtonsPanel, Panel):
row.prop(itasc, "damping_max", text="Damp", slider=True)
row.prop(itasc, "damping_epsilon", text="Eps", slider=True)
from .properties_animviz import (
from bl_ui.properties_animviz import (
MotionPathButtonsPanel,
OnionSkinButtonsPanel,
)

16
release/scripts/startup/bl_ui/properties_data_curve.py
View File

@@ -93,7 +93,7 @@ class DATA_PT_shape_curve(CurveButtonsPanel, Panel):
col.label(text="Twisting:")
col.prop(curve, "twist_mode", text="")
col.prop(curve, "twist_smooth", text="Smooth")
if is_text:
elif is_text:
col.label(text="Display:")
col.prop(curve, "use_fast_edit", text="Fast Editing")
@@ -116,9 +116,9 @@ class DATA_PT_shape_curve(CurveButtonsPanel, Panel):
if is_curve:
col.label(text="Path / Curve-Deform:")
sub = col.column()
rowsub = sub.row()
rowsub.prop(curve, "use_radius")
rowsub.prop(curve, "use_stretch")
subsub = sub.row()
subsub.prop(curve, "use_radius")
subsub.prop(curve, "use_stretch")
sub.prop(curve, "use_deform_bounds")
@@ -322,10 +322,10 @@ class DATA_PT_font(CurveButtonsPanel, Panel):
split = layout.split()
col = split.column()
colsub = col.column(align=True)
colsub.label(text="Underline:")
colsub.prop(text, "underline_position", text="Position")
colsub.prop(text, "underline_height", text="Thickness")
sub = col.column(align=True)
sub.label(text="Underline:")
sub.prop(text, "underline_position", text="Position")
sub.prop(text, "underline_height", text="Thickness")
col = split.column()
col.label(text="Character:")

8
release/scripts/startup/bl_ui/properties_data_mesh.py
View File

@@ -233,7 +233,10 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
sub.prop(ob, "use_shape_key_edit_mode", text="")
sub = row.row()
sub.operator("object.shape_key_clear", icon='X', text="")
if key.use_relative:
sub.operator("object.shape_key_clear", icon='X', text="")
else:
sub.operator("object.shape_key_retime", icon='RECOVER_LAST', text="")
row = layout.row()
row.prop(kb, "name")
@@ -259,8 +262,9 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
col.prop_search(kb, "relative_key", key, "key_blocks", text="")
else:
row = layout.row()
row = layout.column()
row.active = enable_edit_value
row.prop(key, "eval_time")
row.prop(key, "slurph")

2
release/scripts/startup/bl_ui/properties_object.py
View File

@@ -283,7 +283,7 @@ class OBJECT_PT_relations_extras(ObjectButtonsPanel, Panel):
row.prop(ob, "slow_parent_offset", text="Offset")
from .properties_animviz import (
from bl_ui.properties_animviz import (
MotionPathButtonsPanel,
OnionSkinButtonsPanel,
)

2
release/scripts/startup/bl_ui/properties_particle.py
View File

@@ -21,7 +21,7 @@ import bpy
from bpy.types import Panel
from rna_prop_ui import PropertyPanel
from .properties_physics_common import (
from bl_ui.properties_physics_common import (
point_cache_ui,
effector_weights_ui,
basic_force_field_settings_ui,

2
release/scripts/startup/bl_ui/properties_physics_cloth.py
View File

@@ -20,7 +20,7 @@
import bpy
from bpy.types import Menu, Panel
from .properties_physics_common import (
from bl_ui.properties_physics_common import (
point_cache_ui,
effector_weights_ui,
)

3
release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
View File

@@ -17,11 +17,10 @@
# ##### END GPL LICENSE BLOCK #####
# <pep8 compliant>
import bpy
from bpy.types import Panel
from .properties_physics_common import (
from bl_ui.properties_physics_common import (
point_cache_ui,
effector_weights_ui,
)

2
release/scripts/startup/bl_ui/properties_physics_field.py
View File

@@ -20,7 +20,7 @@
import bpy
from bpy.types import Panel
from .properties_physics_common import (
from bl_ui.properties_physics_common import (
basic_force_field_settings_ui,
basic_force_field_falloff_ui,
)

2
release/scripts/startup/bl_ui/properties_physics_smoke.py
View File

@@ -20,7 +20,7 @@
import bpy
from bpy.types import Panel
from .properties_physics_common import (
from bl_ui.properties_physics_common import (
point_cache_ui,
effector_weights_ui,
)

2
release/scripts/startup/bl_ui/properties_physics_softbody.py
View File

@@ -20,7 +20,7 @@
import bpy
from bpy.types import Panel
from .properties_physics_common import (
from bl_ui.properties_physics_common import (
point_cache_ui,
effector_weights_ui,
)

2
release/scripts/startup/bl_ui/properties_texture.py
View File

@@ -52,7 +52,7 @@ class TEXTURE_MT_envmap_specials(Menu):
layout.operator("texture.envmap_clear", icon='FILE_REFRESH')
layout.operator("texture.envmap_clear_all", icon='FILE_REFRESH')
from .properties_material import active_node_mat
from bl_ui.properties_material import active_node_mat
def context_tex_datablock(context):

2
release/scripts/startup/bl_ui/space_dopesheet.py
View File

@@ -210,7 +210,7 @@ class DOPESHEET_MT_marker(Menu):
def draw(self, context):
layout = self.layout
from .space_time import marker_menu_generic
from bl_ui.space_time import marker_menu_generic
marker_menu_generic(layout)
st = context.space_data

4
release/scripts/startup/bl_ui/space_graph.py
View File

@@ -26,7 +26,7 @@ class GRAPH_HT_header(Header):
bl_space_type = 'GRAPH_EDITOR'
def draw(self, context):
from .space_dopesheet import dopesheet_filter
from bl_ui.space_dopesheet import dopesheet_filter
layout = self.layout
@@ -144,7 +144,7 @@ class GRAPH_MT_marker(Menu):
def draw(self, context):
layout = self.layout
from .space_time import marker_menu_generic
from bl_ui.space_time import marker_menu_generic
marker_menu_generic(layout)
# TODO: pose markers for action edit mode only?

2
release/scripts/startup/bl_ui/space_image.py
View File

@@ -19,7 +19,7 @@
# <pep8 compliant>
import bpy
from bpy.types import Header, Menu, Panel
from .properties_paint_common import UnifiedPaintPanel
from bl_ui.properties_paint_common import UnifiedPaintPanel
class ImagePaintPanel(UnifiedPaintPanel):

2
release/scripts/startup/bl_ui/space_info.py
View File

@@ -362,7 +362,7 @@ class INFO_MT_help(Menu):
layout = self.layout
layout.operator("wm.url_open", text="Manual", icon='HELP').url = 'http://wiki.blender.org/index.php/Doc:2.6/Manual'
layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-262/'
layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-263/'
layout.separator()

4
release/scripts/startup/bl_ui/space_nla.py
View File

@@ -26,7 +26,7 @@ class NLA_HT_header(Header):
bl_space_type = 'NLA_EDITOR'
def draw(self, context):
from .space_dopesheet import dopesheet_filter
from bl_ui.space_dopesheet import dopesheet_filter
layout = self.layout
@@ -104,7 +104,7 @@ class NLA_MT_marker(Menu):
def draw(self, context):
layout = self.layout
from .space_time import marker_menu_generic
from bl_ui.space_time import marker_menu_generic
marker_menu_generic(layout)

2
release/scripts/startup/bl_ui/space_sequencer.py
View File

@@ -162,7 +162,7 @@ class SEQUENCER_MT_marker(Menu):
def draw(self, context):
layout = self.layout
from .space_time import marker_menu_generic
from bl_ui.space_time import marker_menu_generic
marker_menu_generic(layout)

2
release/scripts/startup/bl_ui/space_userpref.py
View File

@@ -845,7 +845,7 @@ class USERPREF_PT_file(Panel):
col.prop(system, "use_tabs_as_spaces")
from .space_userpref_keymap import InputKeyMapPanel
from bl_ui.space_userpref_keymap import InputKeyMapPanel
class USERPREF_MT_ndof_settings(Menu):

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -19,7 +19,7 @@
# <pep8 compliant>
import bpy
from bpy.types import Header, Menu, Panel
from .properties_paint_common import UnifiedPaintPanel
from bl_ui.properties_paint_common import UnifiedPaintPanel
class VIEW3D_HT_header(Header):

4
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@@ -19,7 +19,7 @@
# <pep8 compliant>
import bpy
from bpy.types import Menu, Panel
from .properties_paint_common import UnifiedPaintPanel
from bl_ui.properties_paint_common import UnifiedPaintPanel
class View3DPanel():
@@ -144,7 +144,7 @@ class VIEW3D_PT_tools_meshedit(View3DPanel, Panel):
col = layout.column(align=True)
col.label(text="Remove:")
col.operator("mesh.delete")
col.menu("VIEW3D_MT_edit_mesh_delete")
col.operator("mesh.merge")
col.operator("mesh.remove_doubles")