diff --git a/release/ui/buttons_data_camera.py b/release/ui/buttons_data_camera.py index bb87bdf3d06..b41293758ea 100644 --- a/release/ui/buttons_data_camera.py +++ b/release/ui/buttons_data_camera.py @@ -72,7 +72,7 @@ class DATA_PT_cameradisplay(DataButtonsPanel): 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) diff --git a/release/ui/buttons_data_curve.py b/release/ui/buttons_data_curve.py index a51ce50b047..e7dc7810493 100644 --- a/release/ui/buttons_data_curve.py +++ b/release/ui/buttons_data_curve.py @@ -69,7 +69,7 @@ class DATA_PT_geometry(DataButtonsPanel): 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") diff --git a/release/ui/buttons_data_lamp.py b/release/ui/buttons_data_lamp.py index 2005481d38b..2d0efdb83ac 100644 --- a/release/ui/buttons_data_lamp.py +++ b/release/ui/buttons_data_lamp.py @@ -28,7 +28,7 @@ class DATA_PT_lamp(DataButtonsPanel): 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") diff --git a/release/ui/buttons_material.py b/release/ui/buttons_material.py index 665a5223737..d13ae251a5a 100644 --- a/release/ui/buttons_material.py +++ b/release/ui/buttons_material.py @@ -27,7 +27,7 @@ class MATERIAL_PT_material(MaterialButtonsPanel): 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 @@ class MATERIAL_PT_sss(MaterialButtonsPanel): 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 @@ class MATERIAL_PT_raymir(MaterialButtonsPanel): 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 @@ class MATERIAL_PT_raytransp(MaterialButtonsPanel): 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 @@ class MATERIAL_PT_halo(MaterialButtonsPanel): 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 @@ class MATERIAL_PT_halo(MaterialButtonsPanel): 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) diff --git a/release/ui/buttons_objects.py b/release/ui/buttons_objects.py index 8ce0b4bf57d..c0e1f439df8 100644 --- a/release/ui/buttons_objects.py +++ b/release/ui/buttons_objects.py @@ -78,7 +78,7 @@ class OBJECT_PT_duplication(ObjectButtonsPanel): 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,6 +90,30 @@ class OBJECT_PT_duplication(ObjectButtonsPanel): 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" diff --git a/release/ui/buttons_scene.py b/release/ui/buttons_scene.py index 360122fb805..f3ab661a678 100644 --- a/release/ui/buttons_scene.py +++ b/release/ui/buttons_scene.py @@ -19,8 +19,8 @@ class RENDER_PT_shading(RenderButtonsPanel): 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 @@ class RENDER_PT_output(RenderButtonsPanel): 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 @@ class RENDER_PT_antialiasing(RenderButtonsPanel): 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 @@ class RENDER_PT_render(RenderButtonsPanel): 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):