Revision: 20301
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20301
Author: dingto
Date: 2009-05-20 18:24:04 +0200 (Wed, 20 May 2009)
Log Message:
-----------
2.5 Buttons:
* More button tweaks by William Reynish. Thanks!
Modified Paths:
--------------
branches/blender2.5/blender/release/ui/buttons_data_camera.py
branches/blender2.5/blender/release/ui/buttons_data_curve.py
branches/blender2.5/blender/release/ui/buttons_data_lamp.py
branches/blender2.5/blender/release/ui/buttons_material.py
branches/blender2.5/blender/release/ui/buttons_objects.py
branches/blender2.5/blender/release/ui/buttons_scene.py
Modified: branches/blender2.5/blender/release/ui/buttons_data_camera.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_camera.py
2009-05-20 16:23:55 UTC (rev 20300)
+++ branches/blender2.5/blender/release/ui/buttons_data_camera.py
2009-05-20 16:24:04 UTC (rev 20301)
@@ -72,7 +72,7 @@
sub = split.column()
sub.itemR(cam, "show_passepartout", text="Passepartout")
if (cam.show_passepartout):
- sub.itemR(cam, "passepartout_alpha", text="Alpha",
slider="True")
+ sub.itemR(cam, "passepartout_alpha", text="Alpha",
slider=True)
sub.itemR(cam, "draw_size", text="Size")
bpy.types.register(DATA_PT_cameralens)
Modified: branches/blender2.5/blender/release/ui/buttons_data_curve.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_curve.py
2009-05-20 16:23:55 UTC (rev 20300)
+++ branches/blender2.5/blender/release/ui/buttons_data_curve.py
2009-05-20 16:24:04 UTC (rev 20301)
@@ -69,7 +69,7 @@
sub.itemR(curve, "taper_object")
sub = split.column()
sub.itemL(text="Bevel:")
- sub.itemR(curve, "bevel_depth", text="Depth")
+ sub.itemR(curve, "bevel_depth", text="Depth",
slider=True)
sub.itemR(curve, "bevel_resolution", text="Resolution")
sub.itemR(curve, "bevel_object")
Modified: branches/blender2.5/blender/release/ui/buttons_data_lamp.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_data_lamp.py 2009-05-20
16:23:55 UTC (rev 20300)
+++ branches/blender2.5/blender/release/ui/buttons_data_lamp.py 2009-05-20
16:24:04 UTC (rev 20301)
@@ -28,7 +28,7 @@
sub = split.column()
sub.itemR(lamp, "color")
- sub.itemR(lamp, "energy")
+ sub.itemR(lamp, "energy", slider=True)
sub.itemR(lamp, "distance")
sub.itemR(lamp, "negative")
Modified: branches/blender2.5/blender/release/ui/buttons_material.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_material.py 2009-05-20
16:23:55 UTC (rev 20300)
+++ branches/blender2.5/blender/release/ui/buttons_material.py 2009-05-20
16:24:04 UTC (rev 20301)
@@ -27,7 +27,7 @@
row.column().itemR(mat, "mirror_color")
row = layout.row()
- row.itemR(mat, "alpha")
+ row.itemR(mat, "alpha", slider=True)
class MATERIAL_PT_sss(MaterialButtonsPanel):
__idname__= "MATERIAL_PT_sss"
@@ -50,17 +50,17 @@
flow = layout.column_flow()
flow.itemR(sss, "error_tolerance")
flow.itemR(sss, "ior")
- flow.itemR(sss, "scale")
+ flow.itemR(sss, "scale", slider=True)
row = layout.row()
row.column().itemR(sss, "color")
row.column().itemR(sss, "radius")
flow = layout.column_flow()
- flow.itemR(sss, "color_factor")
- flow.itemR(sss, "texture_factor")
- flow.itemR(sss, "front")
- flow.itemR(sss, "back")
+ flow.itemR(sss, "color_factor", slider=True)
+ flow.itemR(sss, "texture_factor", slider=True)
+ flow.itemR(sss, "front", slider=True)
+ flow.itemR(sss, "back", slider=True)
class MATERIAL_PT_raymir(MaterialButtonsPanel):
__idname__= "MATERIAL_PT_raymir"
@@ -83,15 +83,15 @@
split = layout.split()
sub = split.column()
- sub.itemR(raym, "reflect", text="RayMir")
- sub.itemR(raym, "fresnel")
- sub.itemR(raym, "fresnel_fac", text="Fac")
+ sub.itemR(raym, "reflect", text="RayMir", slider=True)
+ sub.itemR(raym, "fresnel", slider=True)
+ sub.itemR(raym, "fresnel_fac", text="Fac", slider=True)
sub = split.column()
- sub.itemR(raym, "gloss")
- sub.itemR(raym, "gloss_threshold")
+ sub.itemR(raym, "gloss", slider=True)
+ sub.itemR(raym, "gloss_threshold", slider=True)
sub.itemR(raym, "gloss_samples")
- sub.itemR(raym, "gloss_anisotropic")
+ sub.itemR(raym, "gloss_anisotropic", slider=True)
flow = layout.column_flow()
flow.itemR(raym, "distance", text="Max Dist")
@@ -120,19 +120,19 @@
sub = split.column()
sub.itemR(rayt, "ior")
- sub.itemR(rayt, "fresnel")
- sub.itemR(rayt, "fresnel_fac", text="Fac")
+ sub.itemR(rayt, "fresnel", slider=True)
+ sub.itemR(rayt, "fresnel_fac", text="Fac", slider=True)
sub = split.column()
- sub.itemR(rayt, "gloss")
- sub.itemR(rayt, "gloss_threshold")
+ sub.itemR(rayt, "gloss", slider=True)
+ sub.itemR(rayt, "gloss_threshold", slider=True)
sub.itemR(rayt, "gloss_samples")
flow = layout.column_flow()
- flow.itemR(rayt, "filter")
+ flow.itemR(rayt, "filter", slider=True)
flow.itemR(rayt, "limit")
- flow.itemR(rayt, "falloff")
- flow.itemR(rayt, "specular_opacity")
+ flow.itemR(rayt, "falloff", slider=True)
+ flow.itemR(rayt, "specular_opacity", slider=True)
flow.itemR(rayt, "depth")
class MATERIAL_PT_halo(MaterialButtonsPanel):
@@ -152,9 +152,9 @@
sub = split.column()
sub.itemL(text="General Settings:")
- sub.itemR(halo, "size")
- sub.itemR(halo, "hardness")
- sub.itemR(halo, "add")
+ sub.itemR(halo, "size", slider=True)
+ sub.itemR(halo, "hardness", slider=True)
+ sub.itemR(halo, "add", slider=True)
sub = split.column()
sub.itemL(text="Elements:")
@@ -175,20 +175,20 @@
sub = row.column()
if (halo.ring):
- sub.itemR(halo, "rings")
+ sub.itemR(halo, "rings", slider=True)
if (halo.lines):
- sub.itemR(halo, "line_number")
+ sub.itemR(halo, "line_number", slider=True)
if (halo.ring or halo.lines):
sub.itemR(halo, "seed")
if (halo.star):
- sub.itemR(halo, "star_tips")
+ sub.itemR(halo, "star_tips", slider=True)
if (halo.flare_mode):
sub.itemL(text="Flare:")
- sub.itemR(halo, "flare_size", text="Size")
- sub.itemR(halo, "flare_subsize", text="Subsize")
- sub.itemR(halo, "flare_boost", text="Boost")
+ sub.itemR(halo, "flare_size", text="Size", slider=True)
+ sub.itemR(halo, "flare_subsize", text="Subsize",
slider=True)
+ sub.itemR(halo, "flare_boost", text="Boost",
slider=True)
sub.itemR(halo, "flare_seed", text="Seed")
- sub.itemR(halo, "flares_sub", text="Sub")
+ sub.itemR(halo, "flares_sub", text="Sub", slider=True)
bpy.types.register(MATERIAL_PT_material)
bpy.types.register(MATERIAL_PT_raymir)
Modified: branches/blender2.5/blender/release/ui/buttons_objects.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_objects.py 2009-05-20
16:23:55 UTC (rev 20300)
+++ branches/blender2.5/blender/release/ui/buttons_objects.py 2009-05-20
16:24:04 UTC (rev 20301)
@@ -78,7 +78,7 @@
layout = self.layout
row = layout.row()
- row.itemR(ob, "dupli_type", text="", expand=True)
+ row.itemR(ob, "dupli_type", expand=True)
if ob.dupli_type == "FRAMES":
split = layout.split()
@@ -90,7 +90,31 @@
sub = split.column(align=True)
sub.itemR(ob, "dupli_frames_on", text="On")
sub.itemR(ob, "dupli_frames_off", text="Off")
+
+ split = layout.split()
+ sub = split.column()
+ sub.itemR(ob, "dupli_frames_no_speed", text="No Speed")
+ elif ob.dupli_type == "VERTS":
+ split = layout.split()
+
+ sub = split.column(align=True)
+ sub.itemR(ob, "dupli_verts_rotation", text="Rotation")
+
+ elif ob.dupli_type == "FACES":
+ split = layout.split()
+
+ sub = split.column()
+ sub.itemR(ob, "dupli_faces_scale", text="Scale")
+ sub = split.column()
+ sub.itemR(ob, "dupli_faces_inherit_scale",
text="Inherit Scale")
+
+ elif ob.dupli_type == "GROUP":
+ split = layout.split()
+
+ sub = split.column(align=True)
+ sub.itemR(ob, "dupli_group", text="Group")
+
class OBJECT_PT_animation(ObjectButtonsPanel):
__idname__ = "OBJECT_PT_animation"
__label__ = "Animation"
Modified: branches/blender2.5/blender/release/ui/buttons_scene.py
===================================================================
--- branches/blender2.5/blender/release/ui/buttons_scene.py 2009-05-20
16:23:55 UTC (rev 20300)
+++ branches/blender2.5/blender/release/ui/buttons_scene.py 2009-05-20
16:24:04 UTC (rev 20301)
@@ -19,8 +19,8 @@
sub = split.column()
sub.itemR(rd, "render_shadows", text="Shadows")
- sub.itemR(rd, "render_sss", text="SSS")
- sub.itemR(rd, "render_envmaps", text="EnvMap")
+ sub.itemR(rd, "render_sss", text="Subsurface Scattering")
+ sub.itemR(rd, "render_envmaps", text="Environment Map")
# sub.itemR(rd, "render_radiosity", text="Radio")
sub = split.column()
@@ -45,7 +45,7 @@
sub = split.column()
sub.itemR(rd, "image_type")
if rd.image_type in ("AVIJPEG", "JPEG"):
- sub.itemR(rd, "quality")
+ sub.itemR(rd, "quality", slider=True)
sub = split.column()
sub.itemR(rd, "color_mode")
@@ -90,7 +90,7 @@
sub = split.column()
sub.itemR(rd, "pixel_filter")
- sub.itemR(rd, "filter_size", text="Size")
+ sub.itemR(rd, "filter_size", text="Size", slider=True)
sub.itemR(rd, "save_buffers")
if rd.save_buffers:
sub.itemR(rd, "full_sample")
@@ -132,7 +132,7 @@
row = layout.row()
row.itemR(rd, "panorama")
- row.itemR(rd, "dither_intensity", text="Dither")
+ row.itemR(rd, "dither_intensity", text="Dither", slider=True)
# row.itemR(rd, "backbuf")
class RENDER_PT_dimensions(RenderButtonsPanel):
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
