Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-08-19 16:51:31 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-08-19 16:51:31 +0400
commit486b3cd2f540f3670e38cf60550100d1689c74c2 (patch)
treef07923b89694b66c397c96c931dc691adb53794f /release
parent46e25e7c77e2dc94ba967c918e17abeaa73c64a7 (diff)
more rna renaming for non-animated properties: mainly Texface, Particle & Pointcache changes.
Changed some names when applying. - render was use_render, changed to show_viewport so call it show_render - texface shadow was use_shadow_face, changed to use_shadow_cast since this only affects casting. - transp was alpha_mode, changed to blend_type since its similar to other overlay blending where this property name is used.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/io/export_x3d.py21
-rw-r--r--release/scripts/io/import_scene_obj.py2
-rw-r--r--release/scripts/io/netrender/client.py6
-rw-r--r--release/scripts/io/netrender/operators.py30
-rw-r--r--release/scripts/io/netrender/repath.py4
-rw-r--r--release/scripts/ui/properties_data_mesh.py26
-rw-r--r--release/scripts/ui/properties_data_modifier.py2
-rw-r--r--release/scripts/ui/properties_particle.py16
-rw-r--r--release/scripts/ui/properties_physics_cloth.py2
-rw-r--r--release/scripts/ui/properties_physics_common.py12
-rw-r--r--release/scripts/ui/properties_physics_field.py2
-rw-r--r--release/scripts/ui/properties_physics_fluid.py2
-rw-r--r--release/scripts/ui/properties_physics_smoke.py4
-rw-r--r--release/scripts/ui/properties_physics_softbody.py2
-rw-r--r--release/scripts/ui/properties_texture.py2
15 files changed, 64 insertions, 69 deletions
diff --git a/release/scripts/io/export_x3d.py b/release/scripts/io/export_x3d.py
index b0c9c94a3b0..d3a8957dd1e 100644
--- a/release/scripts/io/export_x3d.py
+++ b/release/scripts/io/export_x3d.py
@@ -406,13 +406,13 @@ class x3d_class:
# if mesh.faceUV:
for face in mesh.active_uv_texture.data:
# for face in mesh.faces:
- if face.halo and 'HALO' not in mode:
+ if face.use_halo and 'HALO' not in mode:
mode += ['HALO']
- if face.billboard and 'BILLBOARD' not in mode:
+ if face.use_billboard and 'BILLBOARD' not in mode:
mode += ['BILLBOARD']
- if face.object_color and 'OBJECT_COLOR' not in mode:
+ if face.use_object_color and 'OBJECT_COLOR' not in mode:
mode += ['OBJECT_COLOR']
- if face.collision and 'COLLISION' not in mode:
+ if face.use_collision and 'COLLISION' not in mode:
mode += ['COLLISION']
# mode |= face.mode
@@ -964,13 +964,8 @@ class x3d_class:
if mesh.active_uv_texture:
# if mesh.faceUV:
for face in mesh.active_uv_texture.data:
- # for face in mesh.faces:
- sidename='';
- if face.twoside:
- # if face.mode & Mesh.FaceModes.TWOSIDE:
- sidename='two'
- else:
- sidename='one'
+ # for face in mesh.faces
+ sidename = "two" if face.use_twoside else "one":
if sidename in sided:
sided[sidename]+=1
@@ -1003,8 +998,8 @@ class x3d_class:
if face.mode & Mesh.FaceModes.TWOSIDE:
print("Debug: face.mode twosided")
- print("Debug: face.transp=0x%x (enum)" % face.transp)
- if face.transp == Mesh.FaceTranspModes.SOLID:
+ print("Debug: face.transp=0x%x (enum)" % face.blend_type)
+ if face.blend_type == Mesh.FaceTranspModes.SOLID:
print("Debug: face.transp.SOLID")
if face.image:
diff --git a/release/scripts/io/import_scene_obj.py b/release/scripts/io/import_scene_obj.py
index 63c62f4f781..cb56fb62bdc 100644
--- a/release/scripts/io/import_scene_obj.py
+++ b/release/scripts/io/import_scene_obj.py
@@ -747,7 +747,7 @@ def create_mesh(new_objects, has_ngons, CREATE_FGONS, CREATE_EDGES, verts_loc, v
blender_tface.image = image
blender_tface.tex = True
if has_data and image.depth == 32:
- blender_tface.transp = 'ALPHA'
+ blender_tface.blend_type = 'ALPHA'
# BUG - Evil eekadoodle problem where faces that have vert index 0 location at 3 or 4 are shuffled.
if len(face_vert_loc_indicies)==4:
diff --git a/release/scripts/io/netrender/client.py b/release/scripts/io/netrender/client.py
index a1ad4d3e91c..42fea338891 100644
--- a/release/scripts/io/netrender/client.py
+++ b/release/scripts/io/netrender/client.py
@@ -41,7 +41,7 @@ def addFluidFiles(job, path):
job.addFile(path + fluid_file, current_frame, current_frame)
def addPointCache(job, ob, point_cache, default_path):
- if not point_cache.disk_cache:
+ if not point_cache.use_disk_cache:
return
@@ -49,7 +49,7 @@ def addPointCache(job, ob, point_cache, default_path):
if name == "":
name = "".join(["%02X" % ord(c) for c in ob.name])
- cache_path = bpy.path.abspath(point_cache.filepath) if point_cache.external else default_path
+ cache_path = bpy.path.abspath(point_cache.filepath) if point_cache.use_external else default_path
index = "%02i" % point_cache.index
@@ -148,7 +148,7 @@ def clientSendJob(conn, scene, anim = False):
addPointCache(job, object, modifier.domain_settings.point_cache_low, default_path)
if modifier.domain_settings.highres:
addPointCache(job, object, modifier.domain_settings.point_cache_high, default_path)
- elif modifier.type == "MULTIRES" and modifier.external:
+ elif modifier.type == "MULTIRES" and modifier.is_external:
file_path = bpy.path.abspath(modifier.filepath)
job.addFile(file_path)
diff --git a/release/scripts/io/netrender/operators.py b/release/scripts/io/netrender/operators.py
index c9645d0d1ee..252b1146b67 100644
--- a/release/scripts/io/netrender/operators.py
+++ b/release/scripts/io/netrender/operators.py
@@ -52,27 +52,27 @@ class RENDER_OT_netslave_bake(bpy.types.Operator):
modifier.settings.path = relative_path
bpy.ops.fluid.bake({"active_object": object, "scene": scene})
elif modifier.type == "CLOTH":
- modifier.point_cache.step = 1
- modifier.point_cache.disk_cache = True
- modifier.point_cache.external = False
+ modifier.point_cache.frame_step = 1
+ modifier.point_cache.use_disk_cache = True
+ modifier.point_cache.use_external = False
elif modifier.type == "SOFT_BODY":
- modifier.point_cache.step = 1
- modifier.point_cache.disk_cache = True
- modifier.point_cache.external = False
+ modifier.point_cache.frame_step = 1
+ modifier.point_cache.use_disk_cache = True
+ modifier.point_cache.use_external = False
elif modifier.type == "SMOKE" and modifier.smoke_type == "TYPE_DOMAIN":
- modifier.domain_settings.point_cache_low.step = 1
- modifier.domain_settings.point_cache_low.disk_cache = True
- modifier.domain_settings.point_cache_low.external = False
- modifier.domain_settings.point_cache_high.step = 1
- modifier.domain_settings.point_cache_high.disk_cache = True
- modifier.domain_settings.point_cache_high.external = False
+ modifier.domain_settings.point_cache_low.use_step = 1
+ modifier.domain_settings.point_cache_low.use_disk_cache = True
+ modifier.domain_settings.point_cache_low.use_external = False
+ modifier.domain_settings.point_cache_high.use_step = 1
+ modifier.domain_settings.point_cache_high.use_disk_cache = True
+ modifier.domain_settings.point_cache_high.use_external = False
# particles modifier are stupid and don't contain data
# we have to go through the object property
for psys in object.particle_systems:
- psys.point_cache.step = 1
- psys.point_cache.disk_cache = True
- psys.point_cache.external = False
+ psys.point_cache.use_step = 1
+ psys.point_cache.use_disk_cache = True
+ psys.point_cache.use_external = False
psys.point_cache.filepath = relative_path
bpy.ops.ptcache.bake_all()
diff --git a/release/scripts/io/netrender/repath.py b/release/scripts/io/netrender/repath.py
index 9243505bd3b..e0f1c1bfdc7 100644
--- a/release/scripts/io/netrender/repath.py
+++ b/release/scripts/io/netrender/repath.py
@@ -66,7 +66,7 @@ def update(job):
def process(paths):
def processPointCache(point_cache):
- point_cache.external = False
+ point_cache.use_external = False
def processFluid(fluid):
new_path = path_map.get(fluid.path, None)
@@ -123,7 +123,7 @@ def process(paths):
processPointCache(modifier.domain_settings.point_cache_low)
if modifier.domain_settings.highres:
processPointCache(modifier.domain_settings.point_cache_high)
- elif modifier.type == "MULTIRES" and modifier.external:
+ elif modifier.type == "MULTIRES" and modifier.is_external:
file_path = bpy.path.abspath(modifier.filepath)
new_path = path_map.get(file_path, None)
if new_path:
diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/ui/properties_data_mesh.py
index 730320355fd..1188de7f11c 100644
--- a/release/scripts/ui/properties_data_mesh.py
+++ b/release/scripts/ui/properties_data_mesh.py
@@ -300,25 +300,25 @@ class DATA_PT_texface(MeshButtonsPanel, bpy.types.Panel):
split = layout.split()
col = split.column()
- col.prop(tf, "tex")
- col.prop(tf, "light")
- col.prop(tf, "invisible")
- col.prop(tf, "collision")
+ col.prop(tf, "use_bitmap_text")
+ col.prop(tf, "use_light")
+ col.prop(tf, "hide")
+ col.prop(tf, "use_collision")
- col.prop(tf, "shared")
- col.prop(tf, "twoside")
- col.prop(tf, "object_color")
+ col.prop(tf, "use_blend_shared")
+ col.prop(tf, "use_twoside")
+ col.prop(tf, "use_object_color")
col = split.column()
- col.prop(tf, "halo")
- col.prop(tf, "billboard")
- col.prop(tf, "shadow")
- col.prop(tf, "text")
- col.prop(tf, "alpha_sort")
+ col.prop(tf, "use_halo")
+ col.prop(tf, "use_billboard")
+ col.prop(tf, "use_shadow_cast")
+ col.prop(tf, "use_bitmap_text")
+ col.prop(tf, "use_alpha_sort")
col = layout.column()
- col.prop(tf, "transp")
+ col.prop(tf, "blend_type")
else:
col.label(text="No UV Texture")
diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py
index 42fe9e26af3..26080951fff 100644
--- a/release/scripts/ui/properties_data_modifier.py
+++ b/release/scripts/ui/properties_data_modifier.py
@@ -409,7 +409,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel):
col = layout.column()
row = col.row()
- if md.external:
+ if md.is_external:
row.operator("object.multires_external_pack", text="Pack External")
row.label()
row = col.row()
diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py
index 61f22a3a191..27a0a733f3f 100644
--- a/release/scripts/ui/properties_particle.py
+++ b/release/scripts/ui/properties_particle.py
@@ -143,7 +143,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel):
@classmethod
def poll(cls, context):
if particle_panel_poll(PARTICLE_PT_emission, context):
- return not context.particle_system.point_cache.external
+ return not context.particle_system.point_cache.use_external
else:
return False
@@ -284,7 +284,7 @@ class PARTICLE_PT_velocity(ParticleButtonsPanel, bpy.types.Panel):
def poll(cls, context):
if particle_panel_poll(PARTICLE_PT_velocity, context):
psys = context.particle_system
- return psys.settings.physics_type != 'BOIDS' and not psys.point_cache.external
+ return psys.settings.physics_type != 'BOIDS' and not psys.point_cache.use_external
else:
return False
@@ -332,7 +332,7 @@ class PARTICLE_PT_rotation(ParticleButtonsPanel, bpy.types.Panel):
def poll(cls, context):
if particle_panel_poll(PARTICLE_PT_rotation, context):
psys = context.particle_system
- return psys.settings.physics_type != 'BOIDS' and not psys.point_cache.external
+ return psys.settings.physics_type != 'BOIDS' and not psys.point_cache.use_external
else:
return False
@@ -374,7 +374,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel):
@classmethod
def poll(cls, context):
if particle_panel_poll(PARTICLE_PT_physics, context):
- return not context.particle_system.point_cache.external
+ return not context.particle_system.point_cache.use_external
else:
return False
@@ -552,7 +552,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, bpy.types.Panel):
sub.prop(key, "object", text="")
sub.prop(key, "system", text="System")
- layout.prop(key, "mode", expand=True)
+ layout.prop(key, "alliance", expand=True)
elif part.physics_type == 'FLUID':
sub = row.row()
#doesn't work yet
@@ -573,7 +573,7 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, bpy.types.Panel):
return False
if psys.settings is None:
return False
- if psys.point_cache.external:
+ if psys.point_cache.use_external:
return False
return psys.settings.physics_type == 'BOIDS' and engine in cls.COMPAT_ENGINES
@@ -602,7 +602,7 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, bpy.types.Panel):
row = layout.row()
row.prop(state, "ruleset_type")
if state.ruleset_type == 'FUZZY':
- row.prop(state, "rule_fuzziness", slider=True)
+ row.prop(state, "rule_fuzzy", slider=True)
else:
row.label(text="")
@@ -974,7 +974,7 @@ class PARTICLE_PT_field_weights(ParticleButtonsPanel, bpy.types.Panel):
effector_weights_ui(self, context, part.effector_weights)
if part.type == 'HAIR':
- self.layout.prop(part.effector_weights, "do_growing_hair")
+ self.layout.prop(part.effector_weights, "apply_to_hair_growing")
class PARTICLE_PT_force_fields(ParticleButtonsPanel, bpy.types.Panel):
diff --git a/release/scripts/ui/properties_physics_cloth.py b/release/scripts/ui/properties_physics_cloth.py
index 7717c5b41fd..8a770066b0b 100644
--- a/release/scripts/ui/properties_physics_cloth.py
+++ b/release/scripts/ui/properties_physics_cloth.py
@@ -67,7 +67,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, bpy.types.Panel):
split.operator("object.modifier_remove", text="Remove")
row = split.row(align=True)
- row.prop(md, "render", text="")
+ row.prop(md, "show_render", text="")
row.prop(md, "show_viewport", text="")
else:
# add modifier
diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/ui/properties_physics_common.py
index e497492e6ff..b4f54e687f3 100644
--- a/release/scripts/ui/properties_physics_common.py
+++ b/release/scripts/ui/properties_physics_common.py
@@ -36,9 +36,9 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
row = layout.row()
if cachetype in ('PSYS', 'HAIR', 'SMOKE'):
- row.prop(cache, "external")
+ row.prop(cache, "use_external")
- if cache.external:
+ if cache.use_external:
split = layout.split(percentage=0.80)
split.prop(cache, "name", text="File Name")
split.prop(cache, "index", text="")
@@ -61,18 +61,18 @@ def point_cache_ui(self, context, cache, enabled, cachetype):
col.prop(cache, "frame_start")
col.prop(cache, "frame_end")
if cachetype != 'SMOKE':
- col.prop(cache, "step")
+ col.prop(cache, "frame_step")
col = split.column()
if cachetype != 'SMOKE':
sub = col.column()
sub.enabled = enabled
- sub.prop(cache, "quick_cache")
+ sub.prop(cache, "use_quick_cache")
sub = col.column()
sub.enabled = (not bpy.data.is_dirty)
- sub.prop(cache, "disk_cache")
+ sub.prop(cache, "use_disk_cache")
col.label(text=cache.info)
sub = col.column()
@@ -127,7 +127,7 @@ def effector_weights_ui(self, context, weights):
col.prop(weights, "vortex", slider=True)
col.prop(weights, "magnetic", slider=True)
col.prop(weights, "wind", slider=True)
- col.prop(weights, "curveguide", slider=True)
+ col.prop(weights, "curve_guide", slider=True)
col.prop(weights, "texture", slider=True)
col = split.column()
diff --git a/release/scripts/ui/properties_physics_field.py b/release/scripts/ui/properties_physics_field.py
index bc2b6b04479..e09734b9980 100644
--- a/release/scripts/ui/properties_physics_field.py
+++ b/release/scripts/ui/properties_physics_field.py
@@ -180,7 +180,7 @@ class PHYSICS_PT_collision(PhysicButtonsPanel, bpy.types.Panel):
col = split.column()
#row = split.row(align=True)
- #row.prop(md, "render", text="")
+ #row.prop(md, "show_render", text="")
#row.prop(md, "show_viewport", text="")
coll = md.settings
diff --git a/release/scripts/ui/properties_physics_fluid.py b/release/scripts/ui/properties_physics_fluid.py
index dc4fc90e6b6..1148a22bd95 100644
--- a/release/scripts/ui/properties_physics_fluid.py
+++ b/release/scripts/ui/properties_physics_fluid.py
@@ -48,7 +48,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel):
split.operator("object.modifier_remove", text="Remove")
row = split.row(align=True)
- row.prop(md, "render", text="")
+ row.prop(md, "show_render", text="")
row.prop(md, "show_viewport", text="")
fluid = md.settings
diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py
index 822eb129b74..acbe80181c8 100644
--- a/release/scripts/ui/properties_physics_smoke.py
+++ b/release/scripts/ui/properties_physics_smoke.py
@@ -53,7 +53,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, bpy.types.Panel):
split.operator("object.modifier_remove", text="Remove")
row = split.row(align=True)
- row.prop(md, "render", text="")
+ row.prop(md, "show_render", text="")
row.prop(md, "show_viewport", text="")
else:
@@ -105,7 +105,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, bpy.types.Panel):
sub.prop(flow, "initial_velocity", text="Initial Velocity")
sub = sub.column()
sub.active = flow.initial_velocity
- sub.prop(flow, "velocity_multiplier", text="Multiplier")
+ sub.prop(flow, "velocity_factor", text="Multiplier")
sub = split.column()
diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py
index c2c73a10f90..b377f0b6027 100644
--- a/release/scripts/ui/properties_physics_softbody.py
+++ b/release/scripts/ui/properties_physics_softbody.py
@@ -59,7 +59,7 @@ class PHYSICS_PT_softbody(PhysicButtonsPanel, bpy.types.Panel):
split.operator("object.modifier_remove", text="Remove")
row = split.row(align=True)
- row.prop(md, "render", text="")
+ row.prop(md, "show_render", text="")
row.prop(md, "show_viewport", text="")
else:
# add modifier
diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py
index c3e5dc9fae2..9f759e24f53 100644
--- a/release/scripts/ui/properties_texture.py
+++ b/release/scripts/ui/properties_texture.py
@@ -708,7 +708,7 @@ class TEXTURE_PT_envmap(TextureTypePanel, bpy.types.Panel):
split = layout.split()
col = split.column()
- col.prop(env, "ignore_layers")
+ col.prop(env, "layers_ignore")
col.prop(env, "resolution")
col.prop(env, "depth")