Merging r36529-38806bge_components

1 files changed, 9 insertions, 2 deletions

diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py
index 5037308c6fd..4c92296dacd 100644
--- a/release/scripts/startup/bl_ui/properties_particle.py
+++ b/release/scripts/startup/bl_ui/properties_particle.py
@@ -168,10 +168,8 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, bpy.types.Panel):
                 if psys != None and psys.is_edited:
                     if psys.is_global_hair:
                         layout.operator("particle.connect_hair")
-                        layout.label(text="Hair is disconnected.")
                     else:
                         layout.operator("particle.disconnect_hair")
-                        layout.label(text="")
             elif psys != None and part.type == 'REACTOR':
                 split.enabled = particle_panel_enabled(context, psys)
                 split.prop(psys, "reactor_target_object")
@@ -881,6 +879,15 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel):
             col = row.column()
             col.prop(part, "billboard_offset")
 
+            row = layout.row()
+            col = row.column()
+            col.prop(part, "billboard_size", text="Scale")
+            if part.billboard_align == 'VEL':
+                col = row.column(align=True)
+                col.label("Velocity Scale:")
+                col.prop(part, "billboard_velocity_head", text="Head")
+                col.prop(part, "billboard_velocity_tail", text="Tail")
+
             if psys:
                 col = layout.column()
                 col.prop_search(psys, "billboard_normal_uv", ob.data, "uv_textures")