diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-19 19:49:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-19 19:49:30 +0400 |
commit | eee445590a29df35bc27482660937115546f635e (patch) | |
tree | 5327ae9e1ec3e5e2615870840a5b22919b46a486 /release | |
parent | 8e388a8f49da1f8709db3ace0b6590ac71503c6c (diff) |
rna naming mainly forBoids
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/io/netrender/repath.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/properties_particle.py | 42 | ||||
-rw-r--r-- | release/scripts/ui/properties_physics_fluid.py | 4 |
3 files changed, 24 insertions, 24 deletions
diff --git a/release/scripts/io/netrender/repath.py b/release/scripts/io/netrender/repath.py index e0f1c1bfdc7..e7fcad83682 100644 --- a/release/scripts/io/netrender/repath.py +++ b/release/scripts/io/netrender/repath.py @@ -69,7 +69,7 @@ def process(paths): point_cache.use_external = False def processFluid(fluid): - new_path = path_map.get(fluid.path, None) + new_path = path_map.get(fluid.filepath, None) if new_path: fluid.path = new_path diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py index 27a0a733f3f..618d8e5486e 100644 --- a/release/scripts/ui/properties_particle.py +++ b/release/scripts/ui/properties_particle.py @@ -472,31 +472,31 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): row = layout.row() - row.prop(boids, "allow_flight") - row.prop(boids, "allow_land") - row.prop(boids, "allow_climb") + row.prop(boids, "use_flight") + row.prop(boids, "use_land") + row.prop(boids, "use_climb") split = layout.split() sub = split.column() col = sub.column(align=True) - col.active = boids.allow_flight - col.prop(boids, "air_max_speed") - col.prop(boids, "air_min_speed", slider=True) - col.prop(boids, "air_max_acc", slider=True) - col.prop(boids, "air_max_ave", slider=True) + col.active = boids.use_flight + col.prop(boids, "air_speed_max") + col.prop(boids, "air_speed_min", slider=True) + col.prop(boids, "air_acc_max", slider=True) + col.prop(boids, "air_ave_max", slider=True) col.prop(boids, "air_personal_space") row = col.row() - row.active = (boids.allow_land or boids.allow_climb) and boids.allow_flight - row.prop(boids, "landing_smoothness") + row.active = (boids.use_land or boids.allow_climb) and boids.allow_flight + row.prop(boids, "land_smooth") sub = split.column() col = sub.column(align=True) - col.active = boids.allow_land or boids.allow_climb - col.prop(boids, "land_max_speed") + col.active = boids.use_land or boids.allow_climb + col.prop(boids, "land_speed_max") col.prop(boids, "land_jump_speed") - col.prop(boids, "land_max_acc", slider=True) - col.prop(boids, "land_max_ave", slider=True) + col.prop(boids, "land_acc_max", slider=True) + col.prop(boids, "land_ave_max", slider=True) col.prop(boids, "land_personal_space") col.prop(boids, "land_stick_force") @@ -512,7 +512,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel): col = row.column() col.label(text="Misc:") - col.prop(boids, "banking", slider=True) + col.prop(boids, "bank", slider=True) col.prop(boids, "height", slider=True) if part.physics_type == 'KEYED' or part.physics_type == 'BOIDS' or part.physics_type == 'FLUID': @@ -633,26 +633,26 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, bpy.types.Panel): if rule.type == 'GOAL': row.prop(rule, "object") row = layout.row() - row.prop(rule, "predict") + row.prop(rule, "use_predict") elif rule.type == 'AVOID': row.prop(rule, "object") row = layout.row() - row.prop(rule, "predict") + row.prop(rule, "use_predict") row.prop(rule, "fear_factor") elif rule.type == 'FOLLOW_PATH': row.label(text="Not yet functional.") elif rule.type == 'AVOID_COLLISION': - row.prop(rule, "boids") - row.prop(rule, "deflectors") + row.prop(rule, "use_avoid") + row.prop(rule, "use_avoid_collision") row.prop(rule, "look_ahead") elif rule.type == 'FOLLOW_LEADER': row.prop(rule, "object", text="") row.prop(rule, "distance") row = layout.row() - row.prop(rule, "line") + row.prop(rule, "use_line") sub = row.row() sub.active = rule.line - sub.prop(rule, "queue_size") + sub.prop(rule, "queue_count") elif rule.type == 'AVERAGE_SPEED': row.prop(rule, "speed", slider=True) row.prop(rule, "wander", slider=True) diff --git a/release/scripts/ui/properties_physics_fluid.py b/release/scripts/ui/properties_physics_fluid.py index 1148a22bd95..35934ebfb32 100644 --- a/release/scripts/ui/properties_physics_fluid.py +++ b/release/scripts/ui/properties_physics_fluid.py @@ -100,7 +100,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): col.prop(fluid, "generate_speed_vectors") col.prop(fluid, "reverse_frames") - layout.prop(fluid, "path", text="") + layout.prop(fluid, "filepath", text="") elif fluid.type == 'FLUID': split = layout.split() @@ -168,7 +168,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel): col.prop(fluid, "floats") col.prop(fluid, "show_tracer") - layout.prop(fluid, "path", text="") + layout.prop(fluid, "filepath", text="") elif fluid.type == 'CONTROL': split = layout.split() |