← Back to branch summary

~ubuntu-branches/ubuntu/saucy/blender/saucy-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
release/scripts/startup/bl_ui/properties_physics_field.py
20
20
import bpy
21
21
from bpy.types import Panel
22
22
 
23
 
from bl_ui.properties_physics_common import (
24
 
    basic_force_field_settings_ui,
25
 
    basic_force_field_falloff_ui,
26
 
    )
 
23
from bl_ui.properties_physics_common import (basic_force_field_settings_ui,
 
24
                                             basic_force_field_falloff_ui,
 
25
                                             )
27
26
 
28
27
 
29
28
class PhysicButtonsPanel():
92
91
            layout.separator()
93
92
 
94
93
            layout.prop(field, "guide_kink_type")
95
 
            if (field.guide_kink_type != 'NONE'):
 
94
            if field.guide_kink_type != 'NONE':
96
95
                layout.prop(field, "guide_kink_axis")
97
96
 
98
97
                split = layout.split()
112
111
 
113
112
            col = split.column()
114
113
            col.prop(field, "use_object_coords")
115
 
            col.prop(field, "use_root_coords")
116
114
            col.prop(field, "use_2d_force")
 
115
        elif field.type == 'SMOKE_FLOW':
 
116
            col = split.column()
 
117
            col.prop(field, "strength")
 
118
            col.prop(field, "flow")
 
119
            col = split.column()
 
120
            col.label(text="Domain Object:")
 
121
            col.prop(field, "source_object", "")
 
122
            col.prop(field, "use_smoke_density")
117
123
        else:
118
124
            basic_force_field_settings_ui(self, context, field)
119
125
 
169
175
 
170
176
class PHYSICS_PT_collision(PhysicButtonsPanel, Panel):
171
177
    bl_label = "Collision"
172
 
    #bl_options = {'DEFAULT_CLOSED'}
173
178
 
174
179
    @classmethod
175
180
    def poll(cls, context):
196
201
            col = split.column()
197
202
            col.label(text="Particle:")
198
203
            col.prop(settings, "permeability", slider=True)
199
 
            col.prop(settings, "stickness")
 
204
            col.prop(settings, "stickiness")
200
205
            col.prop(settings, "use_particle_kill")
201
206
            col.label(text="Particle Damping:")
202
207
            sub = col.column(align=True)