← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to release/scripts/startup/bl_ui/properties_particle.py

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
release/scripts/startup/bl_ui/properties_particle.py
599
599
 
600
600
            split = layout.split()
601
601
 
602
 
            sub = split.column()
603
 
            col = sub.column(align=True)
 
602
            col = split.column(align=True)
604
603
            col.active = boids.use_flight
605
604
            col.prop(boids, "air_speed_max")
606
605
            col.prop(boids, "air_speed_min", slider=True)
607
606
            col.prop(boids, "air_acc_max", slider=True)
608
607
            col.prop(boids, "air_ave_max", slider=True)
609
608
            col.prop(boids, "air_personal_space")
610
 
            row = col.row()
 
609
            row = col.row(align=True)
611
610
            row.active = (boids.use_land or boids.use_climb) and boids.use_flight
612
611
            row.prop(boids, "land_smooth")
613
612
 
614
 
            sub = split.column()
615
 
            col = sub.column(align=True)
 
613
            col = split.column(align=True)
616
614
            col.active = boids.use_land or boids.use_climb
617
615
            col.prop(boids, "land_speed_max")
618
616
            col.prop(boids, "land_jump_speed")
621
619
            col.prop(boids, "land_personal_space")
622
620
            col.prop(boids, "land_stick_force")
623
621
 
624
 
            row = layout.row()
 
622
            split = layout.split()
625
623
 
626
 
            col = row.column(align=True)
 
624
            col = split.column(align=True)
627
625
            col.label(text="Battle:")
628
626
            col.prop(boids, "health")
629
627
            col.prop(boids, "strength")
631
629
            col.prop(boids, "accuracy")
632
630
            col.prop(boids, "range")
633
631
 
634
 
            col = row.column()
 
632
            col = split.column()
635
633
            col.label(text="Misc:")
636
634
            col.prop(boids, "bank", slider=True)
637
635
            col.prop(boids, "pitch", slider=True)
1037
1035
        col = row.column(align=True)
1038
1036
        col.label(text="Color:")
1039
1037
        col.prop(part, "draw_color", text="")
1040
 
        sub = col.row()
 
1038
        sub = col.row(align=True)
1041
1039
        sub.active = (part.draw_color in {'VELOCITY', 'ACCELERATION'})
1042
1040
        sub.prop(part, "color_maximum", text="Max")
1043
1041
 
1139
1137
        sub.prop(part, "kink_amplitude")
1140
1138
        sub.prop(part, "kink_amplitude_clump", text="Clump", slider=True)
1141
1139
        col.prop(part, "kink_flat", slider=True)
1142
 
        col = split.column()
1143
 
        sub = col.column(align=True)
1144
 
        sub.prop(part, "kink_frequency")
1145
 
        sub.prop(part, "kink_shape", slider=True)
 
1140
        col = split.column(align=True)
 
1141
        col.prop(part, "kink_frequency")
 
1142
        col.prop(part, "kink_shape", slider=True)
1146
1143
 
1147
1144
 
1148
1145
class PARTICLE_PT_field_weights(ParticleButtonsPanel, Panel):