diff options
author | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-06-11 22:15:46 +0400 |
---|---|---|
committer | Xiao Xiangquan <xiaoxiangquan@gmail.com> | 2011-06-11 22:15:46 +0400 |
commit | 12f0795d498d4143af5a3203efad07589312300d (patch) | |
tree | 1638bd9c509270db9f1e4d54aac469fbb35d5e69 /release | |
parent | 2d3795ab3c5b107702012b21354174da2ca00e33 (diff) | |
parent | 81946b9138201800e495eb28addf254958feb1a4 (diff) |
accident when merge. revert to r37405
Diffstat (limited to 'release')
6 files changed, 12 insertions, 24 deletions
diff --git a/release/scripts/modules/console/complete_namespace.py b/release/scripts/modules/console/complete_namespace.py index d787fed0967..a31280ebff0 100644 --- a/release/scripts/modules/console/complete_namespace.py +++ b/release/scripts/modules/console/complete_namespace.py @@ -37,11 +37,6 @@ def is_dict(obj): return hasattr(obj, 'keys') and hasattr(getattr(obj, 'keys'), '__call__') -def is_struct_seq(obj): - """Returns whether obj is a structured sequence subclass: sys.float_info""" - return isinstance(obj, tuple) and hasattr(obj, 'n_fields') - - def complete_names(word, namespace): """Complete variable names or attributes @@ -179,7 +174,7 @@ def complete(word, namespace, private=True): if type(obj) in (bool, float, int, str): return [] # an extra char '[', '(' or '.' will be added - if hasattr(obj, '__getitem__') and not is_struct_seq(obj): + if hasattr(obj, '__getitem__'): # list or dictionary matches = complete_indices(word, namespace, obj) elif hasattr(obj, '__call__'): diff --git a/release/scripts/modules/console_python.py b/release/scripts/modules/console_python.py index 455eabe377b..3048fa1d597 100644 --- a/release/scripts/modules/console_python.py +++ b/release/scripts/modules/console_python.py @@ -80,7 +80,7 @@ def get_console(console_id): if console_data: console, stdout, stderr = console_data - # XXX, bug in python 3.1.2, 3.2 ? (worked in 3.1.1) + # XXX, bug in python 3.1.2 ? (worked in 3.1.1) # seems there is no way to clear StringIO objects for writing, have to make new ones each time. import io stdout = io.StringIO() diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index e2c88413177..7097988d25b 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -99,9 +99,8 @@ class DATA_PT_normals(MeshButtonsPanel, bpy.types.Panel): split.prop(mesh, "show_double_sided") -class DATA_PT_texture_space(MeshButtonsPanel, bpy.types.Panel): - bl_label = "Texture Space" - bl_options = {'DEFAULT_CLOSED'} +class DATA_PT_settings(MeshButtonsPanel, bpy.types.Panel): + bl_label = "Settings" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} def draw(self, context): @@ -110,13 +109,8 @@ class DATA_PT_texture_space(MeshButtonsPanel, bpy.types.Panel): mesh = context.mesh layout.prop(mesh, "texture_mesh") - - layout.separator() - layout.prop(mesh, "use_auto_texspace") - row = layout.row() - row.column().prop(mesh, "texspace_location", text="Location") - row.column().prop(mesh, "texspace_size", text="Size") + class DATA_PT_vertex_groups(MeshButtonsPanel, bpy.types.Panel): bl_label = "Vertex Groups" diff --git a/release/scripts/startup/bl_ui/properties_data_metaball.py b/release/scripts/startup/bl_ui/properties_data_metaball.py index c568d10b3b0..81ba15d6f40 100644 --- a/release/scripts/startup/bl_ui/properties_data_metaball.py +++ b/release/scripts/startup/bl_ui/properties_data_metaball.py @@ -70,10 +70,6 @@ class DATA_PT_metaball(DataButtonsPanel, bpy.types.Panel): layout.label(text="Update:") layout.prop(mball, "update_method", expand=True) - - row = layout.row() - row.column().prop(mball, "texspace_location") - row.column().prop(mball, "texspace_size") class DATA_PT_metaball_element(DataButtonsPanel, bpy.types.Panel): diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 586675f2ca0..75069993521 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -483,10 +483,11 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.label(text="Mode:") col.prop(md, "wrap_method", text="") + split = layout.split(percentage=0.25) + + col = split.column() + if md.wrap_method == 'PROJECT': - split = layout.split(percentage=0.25) - - col = split.column() col.label(text="Axis:") col.prop(md, "use_project_x") col.prop(md, "use_project_y") @@ -498,6 +499,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "use_positive_direction") col = split.column() + col.label(text="Cull Faces:") col.prop(md, "cull_face", expand=True) diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 1dae976dd3b..a3b10702fa7 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -254,7 +254,8 @@ class RENDER_PT_post_processing(RenderButtonsPanel, bpy.types.Panel): col.prop(rd, "use_compositing") col.prop(rd, "use_sequencer") - split.prop(rd, "dither_intensity", text="Dither", slider=True) + col = split.column() + col.prop(rd, "dither_intensity", text="Dither", slider=True) layout.separator() |