← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-04-28 12:11:12 UTC
  • mto: (14.1.6 experimental) (1.5.1)
  • mto: This revision was merged to the branch mainline in revision 34.
  • Revision ID: package-import@ubuntu.com-20120428121112-2zi0vp8b6vejda8i
Tags: upstream-2.63
Import upstream version 2.63

Show diffs side-by-side

added added

removed removed

Lines of Context:
release/scripts/startup/bl_ui/properties_game.py
122
122
            col = split.column()
123
123
            col.label(text="Attributes:")
124
124
            col.prop(game, "mass")
125
 
            col.prop(soft, "weld_threshold")
 
125
            # disabled in the code
 
126
            # col.prop(soft, "weld_threshold")
126
127
            col.prop(soft, "location_iterations")
127
128
            col.prop(soft, "linear_stiffness", slider=True)
128
129
            col.prop(soft, "dynamic_friction", slider=True)
165
166
            subsub.active = game.use_anisotropic_friction
166
167
            subsub.prop(game, "friction_coefficients", text="", slider=True)
167
168
 
168
 
        elif physics_type in {'SENSOR', 'INVISIBLE', 'NO_COLLISION', 'OCCLUDE'}:
 
169
        elif physics_type == 'SENSOR':
 
170
            col = layout.column()
 
171
            col.prop(game, "use_actor", text="Detect Actors")
 
172
            col.prop(ob, "hide_render", text="Invisible")
 
173
 
 
174
        elif physics_type in {'INVISIBLE', 'NO_COLLISION', 'OCCLUDE'}:
169
175
            layout.prop(ob, "hide_render", text="Invisible")
170
176
 
171
177
        elif physics_type == 'NAVMESH':
329
335
                col.prop(gs, "dome_angle", slider=True)
330
336
 
331
337
                col = split.column()
332
 
                col.prop(gs, "dome_tesselation", text="Tesselation")
 
338
                col.prop(gs, "dome_tessellation", text="Tessellation")
333
339
                col.prop(gs, "dome_tilt")
334
340
 
335
341
            elif dome_type == 'PANORAM_SPH':
337
343
 
338
344
                col.prop(gs, "dome_buffer_resolution", text="Resolution", slider=True)
339
345
                col = split.column()
340
 
                col.prop(gs, "dome_tesselation", text="Tesselation")
 
346
                col.prop(gs, "dome_tessellation", text="Tessellation")
341
347
 
342
348
            else:  # cube map
343
349
                col = split.column()