Page MenuHome
Files F13706

ui.txt
Public
Actions

Authored By
Ronny (nutelz)
Nov 13 2013, 2:47 PM
Size
14 KB
Subscribers
None

ui.txt
View Options

Index: release/scripts/ui/properties_physics_smoke.py
===================================================================
--- release/scripts/ui/properties_physics_smoke.py (Revision 30383)
+++ release/scripts/ui/properties_physics_smoke.py (Arbeitskopie)
@@ -102,16 +102,15 @@
col.label(text="Particle System:")
col.prop_object(flow, "psys", ob, "particle_systems", text="")
- if md.flow_settings.outflow:
- if wide_ui:
- col = split.column()
- else:
- if wide_ui:
- col = split.column()
- col.label(text="Behavior:")
- col.prop(flow, "temperature")
- col.prop(flow, "density")
+ if wide_ui:
+ col = split.column()
+ sub = col.column()
+ sub.active = not md.flow_settings.outflow
+ sub.label(text="Behavior:")
+ sub.prop(flow, "temperature")
+ sub.prop(flow, "density")
+
#elif md.smoke_type == 'COLLISION':
# layout.separator()
@@ -254,4 +253,4 @@
unregister(cls)
if __name__ == "__main__":
- register()
+ register()
\ No newline at end of file
Index: release/scripts/ui/properties_world.py
===================================================================
--- release/scripts/ui/properties_world.py (Revision 30383)
+++ release/scripts/ui/properties_world.py (Arbeitskopie)
@@ -173,15 +173,20 @@
def draw(self, context):
layout = self.layout
+ wide_ui = context.region.width > narrowui
light = context.world.lighting
layout.active = light.use_ambient_occlusion
split = layout.split()
- split.prop(light, "ao_factor", text="Factor")
- split.prop(light, "ao_blend_mode", text="")
+ col = split.column()
+ col.prop(light, "ao_factor", text="Factor")
+ if wide_ui:
+ col = split.column()
+ col.prop(light, "ao_blend_mode", text="")
+
class WORLD_PT_environment_lighting(WorldButtonsPanel):
bl_label = "Environment Lighting"
COMPAT_ENGINES = {'BLENDER_RENDER'}
@@ -192,15 +197,20 @@
def draw(self, context):
layout = self.layout
+ wide_ui = context.region.width > narrowui
light = context.world.lighting
layout.active = light.use_environment_lighting
split = layout.split()
- split.prop(light, "environment_energy", text="Energy")
- split.prop(light, "environment_color", text="")
+ col = split.column()
+ col.prop(light, "environment_energy", text="Energy")
+ if wide_ui:
+ col = split.column()
+ col.prop(light, "environment_color", text="")
+
class WORLD_PT_indirect_lighting(WorldButtonsPanel):
bl_label = "Indirect Lighting"
COMPAT_ENGINES = {'BLENDER_RENDER'}
@@ -211,21 +221,27 @@
def draw(self, context):
layout = self.layout
+ wide_ui = context.region.width > narrowui
light = context.world.lighting
layout.active = light.use_indirect_lighting
split = layout.split()
- split.prop(light, "indirect_factor", text="Factor")
- split.prop(light, "indirect_bounces", text="Bounces")
+ col = split.column()
+ col.prop(light, "indirect_factor", text="Factor")
+ if wide_ui:
+ col = split.column()
+ col.prop(light, "indirect_bounces", text="Bounces")
+
class WORLD_PT_gather(WorldButtonsPanel):
bl_label = "Gather"
COMPAT_ENGINES = {'BLENDER_RENDER'}
def draw(self, context):
layout = self.layout
+ wide_ui = context.region.width > narrowui
light = context.world.lighting
layout.active = light.use_ambient_occlusion or light.use_environment_lighting or light.use_indirect_lighting
@@ -244,7 +260,8 @@
sub.prop(light, "falloff_strength", text="Strength")
if light.gather_method == 'RAYTRACE':
- col = split.column()
+ if wide_ui:
+ col = split.column()
col.label(text="Sampling:")
col.prop(light, "sample_method", text="")
@@ -259,7 +276,8 @@
sub.prop(light, "bias")
if light.gather_method == 'APPROXIMATE':
- col = split.column()
+ if wide_ui:
+ col = split.column()
col.label(text="Sampling:")
col.prop(light, "passes")
@@ -294,4 +312,4 @@
unregister(cls)
if __name__ == "__main__":
- register()
+ register()
\ No newline at end of file
Index: release/scripts/ui/properties_data_modifier.py
===================================================================
--- release/scripts/ui/properties_data_modifier.py (Revision 30383)
+++ release/scripts/ui/properties_data_modifier.py (Arbeitskopie)
@@ -501,23 +501,23 @@
split = layout.split()
col = split.column()
- col.prop(md, "axis")
- col.prop(md, "object", text="AxisOb")
+ col.label(text="Axis:")
+ col.row().prop(md, "axis", expand=True)
+ col.prop(md, "object", text="")
+ sub = col.column()
+ sub.active = (md.object is not None)
+ sub.prop(md, "use_object_screw_offset", text="Screw")
+ col.prop(md, "screw_offset")
col.prop(md, "angle")
- col.prop(md, "steps")
- col.prop(md, "render_steps")
if wide_ui:
col = split.column()
- row = col.row()
- row.active = (md.object is None or md.use_object_screw_offset == False)
- row.prop(md, "screw_offset")
- row = col.row()
- row.active = (md.object is not None)
- row.prop(md, "use_object_screw_offset")
+ col.label(text="")
+ col.prop(md, "steps")
+ col.prop(md, "render_steps")
+ col.prop(md, "iterations")
col.prop(md, "use_normal_calculate")
- col.prop(md, "use_normal_flip")
- col.prop(md, "iterations")
+ col.prop(md, "use_normal_flip", text="Flip Normals")
def SHRINKWRAP(self, layout, ob, md, wide_ui):
split = layout.split()
@@ -628,22 +628,23 @@
split = layout.split()
col = split.column()
- col.prop(md, "thickness")
- col.prop_object(md, "vertex_group", ob, "vertex_groups", text="")
+ col.label(text="Thickness:")
+ col.prop(md, "thickness", text="Amount")
+ col.prop(md, "offset")
- col.label(text="Crease:")
- col.prop(md, "edge_crease_inner", text="Inner")
- col.prop(md, "edge_crease_outer", text="Outer")
- col.prop(md, "edge_crease_rim", text="Rim")
-
if wide_ui:
col = split.column()
- col.prop(md, "offset")
+ col.label(text="Vertex Group:")
+ col.prop_object(md, "vertex_group", ob, "vertex_groups", text="")
colsub = col.column()
colsub.active = (md.vertex_group is not "")
colsub.prop(md, "invert", text="Invert")
+ split = layout.split()
+
+ col = split.column()
+
col.prop(md, "use_even_offset")
col.prop(md, "use_quality_normals")
@@ -652,6 +653,14 @@
colsub.active = md.use_rim
colsub.prop(md, "use_rim_material")
+ if wide_ui:
+ col = split.column()
+
+ col.label(text="Crease:")
+ col.prop(md, "edge_crease_inner", text="Inner")
+ col.prop(md, "edge_crease_outer", text="Outer")
+ col.prop(md, "edge_crease_rim", text="Rim")
+
# col = layout.column()
# col.label(text="Vertex Group:")
# col.prop_object(md, "vertex_group", ob, "vertex_groups", text="")
@@ -783,4 +792,4 @@
unregister(cls)
if __name__ == "__main__":
- register()
+ register()
\ No newline at end of file
Index: release/scripts/ui/properties_physics_common.py
===================================================================
--- release/scripts/ui/properties_physics_common.py (Revision 30383)
+++ release/scripts/ui/properties_physics_common.py (Arbeitskopie)
@@ -204,28 +204,32 @@
wide_ui = context.region.width > narrowui
- # XXX: This doesn't update for some reason.
- #if wide_ui:
- # split = layout.split()
- #else:
- split = layout.split(percentage=0.35)
-
if not field or field.type == 'NONE':
return
+ if wide_ui:
+ row = layout.row()
+ else:
+ row = layout.split().column()
+
+ row.prop(field, "z_direction", text="")
+ row.prop(field, "falloff_power", text="Power")
+
+ split = layout.split()
+
col = split.column()
- col.prop(field, "z_direction", text="")
+
col.prop(field, "use_min_distance", text="Use Minimum")
- col.prop(field, "use_max_distance", text="Use Maximum")
- if wide_ui:
- col = split.column()
- col.prop(field, "falloff_power", text="Power")
-
sub = col.column()
sub.active = field.use_min_distance
sub.prop(field, "minimum_distance", text="Distance")
+ if wide_ui:
+ col = split.column()
+
+ col.prop(field, "use_max_distance", text="Use Maximum")
+
sub = col.column()
sub.active = field.use_max_distance
sub.prop(field, "maximum_distance", text="Distance")
@@ -239,4 +243,4 @@
pass
if __name__ == "__main__":
- register()
+ register()
\ No newline at end of file
Index: release/scripts/ui/properties_render.py
===================================================================
--- release/scripts/ui/properties_render.py (Revision 30383)
+++ release/scripts/ui/properties_render.py (Arbeitskopie)
@@ -237,7 +237,8 @@
sub.label(text="Acceleration structure:")
sub.prop(rd, "raytrace_structure", text="")
if rd.raytrace_structure == 'OCTREE':
- sub.prop(rd, "octree_resolution", text="Resolution")
+ sub.label(text="Resolution:")
+ sub.row().prop(rd, "octree_resolution", expand=True)
else:
sub.prop(rd, "use_instances", text="Instances")
sub.prop(rd, "use_local_coords", text="Local Coordinates")
@@ -601,7 +602,7 @@
col.prop(rd, "stamp_camera", text="Camera")
col.prop(rd, "stamp_filename", text="Filename")
col.prop(rd, "stamp_marker", text="Marker")
- col.prop(rd, "stamp_sequencer_strip", text="Seq. Strip")
+ col.prop(rd, "stamp_sequencer_strip", text="Sequencer Strip")
if wide_ui:
col = split.column()
@@ -611,9 +612,8 @@
col.separator()
col.prop(rd, "stamp_font_size", text="Font Size")
- row = layout.split(percentage=0.2)
- row.prop(rd, "stamp_note", text="Note")
- sub = row.row()
+ layout.prop(rd, "stamp_note", text="Note")
+ sub = layout.column()
sub.active = rd.stamp_note
sub.prop(rd, "stamp_note_text", text="")
@@ -694,4 +694,4 @@
unregister(cls)
if __name__ == "__main__":
- register()
+ register()
\ No newline at end of file
Index: release/scripts/ui/properties_physics_field.py
===================================================================
--- release/scripts/ui/properties_physics_field.py (Revision 30383)
+++ release/scripts/ui/properties_physics_field.py (Arbeitskopie)
@@ -125,45 +125,62 @@
basic_force_field_falloff_ui(self, context, field)
if field.falloff_type == 'CONE':
- layout.separator()
- split = layout.split(percentage=0.35)
+ if wide_ui:
+ layout.separator()
+ row = layout.row()
+ else:
+ row = layout.split().column()
+ row.label(text="Angular:")
+
+ row.prop(field, "radial_falloff", text="Power")
+
+ split = layout.split()
+
col = split.column()
- col.label(text="Angular:")
+
col.prop(field, "use_radial_min", text="Use Minimum")
- col.prop(field, "use_radial_max", text="Use Maximum")
- if wide_ui:
- col = split.column()
- col.prop(field, "radial_falloff", text="Power")
-
sub = col.column()
sub.active = field.use_radial_min
sub.prop(field, "radial_minimum", text="Angle")
+ if wide_ui:
+ col = split.column()
+
+ col.prop(field, "use_radial_max", text="Use Maximum")
+
sub = col.column()
sub.active = field.use_radial_max
sub.prop(field, "radial_maximum", text="Angle")
elif field.falloff_type == 'TUBE':
- layout.separator()
- split = layout.split(percentage=0.35)
+ if wide_ui:
+ layout.separator()
+ row = layout.row()
+ else:
+ row = layout.split().column()
+ row.label(text="Radial:")
+ row.prop(field, "radial_falloff", text="Power")
+
+ split = layout.split()
+
col = split.column()
- col.label(text="Radial:")
+
col.prop(field, "use_radial_min", text="Use Minimum")
- col.prop(field, "use_radial_max", text="Use Maximum")
- if wide_ui:
- col = split.column()
- col.prop(field, "radial_falloff", text="Power")
-
sub = col.column()
sub.active = field.use_radial_min
sub.prop(field, "radial_minimum", text="Distance")
+ if wide_ui:
+ col = split.column()
+
+ col.prop(field, "use_radial_max", text="Use Maximum")
+
sub = col.column()
sub.active = field.use_radial_max
sub.prop(field, "radial_maximum", text="Distance")
@@ -260,4 +277,4 @@
unregister(cls)
if __name__ == "__main__":
- register()
+ register()
\ No newline at end of file
Index: source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- source/blender/makesrna/intern/rna_modifier.c (Revision 30383)
+++ source/blender/makesrna/intern/rna_modifier.c (Arbeitskopie)
@@ -2126,9 +2126,9 @@
static void rna_def_modifier_screw(BlenderRNA *brna)
{
static EnumPropertyItem axis_items[]= {
- {0, "X", 0, "X Axis", ""},
- {1, "Y", 0, "Y Axis", ""},
- {2, "Z", 0, "Z Axis", ""},
+ {0, "X", 0, "X", ""},
+ {1, "Y", 0, "Y", ""},
+ {2, "Z", 0, "Z", ""},
{0, NULL, 0, NULL, NULL}};
StructRNA *srna;

File Metadata

Mime Type
text/x-diff
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
e7/38/f6be2e9c7d92ddafbaf6e1f15e8a

Event Timeline