diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-19 16:51:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-19 16:51:31 +0400 |
commit | 486b3cd2f540f3670e38cf60550100d1689c74c2 (patch) | |
tree | f07923b89694b66c397c96c931dc691adb53794f | |
parent | 46e25e7c77e2dc94ba967c918e17abeaa73c64a7 (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.
26 files changed, 109 insertions, 106 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") diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 7c363a17d74..4b522c9ddcb 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -745,7 +745,7 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif if ( ((md->type!=eModifierType_Softbody && md->type!=eModifierType_Collision) || !(ob->pd && ob->pd->deflect)) && (md->type!=eModifierType_Surface) ) { - uiItemR(row, &ptr, "render", 0, "", 0); + uiItemR(row, &ptr, "show_render", 0, "", 0); uiItemR(row, &ptr, "show_viewport", 0, "", 0); if (mti->flags & eModifierTypeFlag_SupportsEditmode) diff --git a/source/blender/makesrna/intern/rna_boid.c b/source/blender/makesrna/intern/rna_boid.c index 636d45730a7..4b705f0fb8e 100644 --- a/source/blender/makesrna/intern/rna_boid.c +++ b/source/blender/makesrna/intern/rna_boid.c @@ -443,7 +443,8 @@ static void rna_def_boidstate(BlenderRNA *brna) RNA_def_property_int_funcs(prop, "rna_BoidState_active_boid_rule_index_get", "rna_BoidState_active_boid_rule_index_set", "rna_BoidState_active_boid_rule_index_range"); RNA_def_property_ui_text(prop, "Active Boid Rule Index", ""); - prop= RNA_def_property(srna, "rule_fuzziness", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "rule_fuzzy", PROP_FLOAT, PROP_NONE); + RNA_def_property_float_sdna(prop, NULL, "rule_fuzziness"); RNA_def_property_range(prop, 0.0, 1.0); RNA_def_property_ui_text(prop, "Rule Fuzziness", ""); RNA_def_property_update(prop, 0, "rna_Boids_reset"); diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 358392f5a63..f30b87bf7a5 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1321,67 +1321,68 @@ static void rna_def_mtface(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Image", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "tex", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_texture", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_TEX); RNA_def_property_ui_text(prop, "Tex", "Render face with texture"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "light", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_light", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_LIGHT); RNA_def_property_ui_text(prop, "Light", "Use light for face"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "invisible", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_INVISIBLE); RNA_def_property_ui_text(prop, "Invisible", "Make face invisible"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "collision", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_collision", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_DYNAMIC); RNA_def_property_ui_text(prop, "Collision", "Use face for collision and ray-sensor detection"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "shared", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_blend_shared", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_SHAREDCOL); RNA_def_property_ui_text(prop, "Shared", "Blend vertex colors across face when vertices are shared"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "twoside", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_twoside", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_TWOSIDE); RNA_def_property_ui_text(prop, "Two-side", "Render face two-sided"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "object_color", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_object_color", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_OBCOL); RNA_def_property_ui_text(prop, "Object Color", "Use ObColor instead of vertex colors"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "halo", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_halo", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BILLBOARD); RNA_def_property_ui_text(prop, "Halo", "Screen aligned billboard"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "billboard", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_billboard", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BILLBOARD2); RNA_def_property_ui_text(prop, "Billboard", "Billboard with Z-axis constraint"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "shadow", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_shadow_cast", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_SHADOW); RNA_def_property_ui_text(prop, "Shadow", "Face is used for shadow"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "text", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_bitmap_text", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_BMFONT); RNA_def_property_ui_text(prop, "Text", "Enable bitmap text on face"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "alpha_sort", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_alpha_sort", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", TF_ALPHASORT); RNA_def_property_ui_text(prop, "Alpha Sort", "Enable sorting of faces for correct alpha drawing (slow, use Clip Alpha instead when possible)"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "transp", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "blend_type", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "transp"); RNA_def_property_enum_items(prop, transp_items); RNA_def_property_ui_text(prop, "Transparency", "Transparency blending mode"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); @@ -1392,7 +1393,7 @@ static void rna_def_mtface(BlenderRNA *brna) RNA_def_property_ui_text(prop, "UV Selected", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); - prop= RNA_def_property(srna, "uv_pinned", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "pin_uv", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "unwrap", TF_PIN1); RNA_def_property_array(prop, 4); RNA_def_property_ui_text(prop, "UV Pinned", ""); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 00eb39d940b..68ddfd9ef06 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -2267,7 +2267,7 @@ void RNA_def_modifier(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Modifier_update"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 0); - prop= RNA_def_property(srna, "render", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "show_render", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", eModifierMode_Render); RNA_def_property_ui_text(prop, "Render", "Use modifier during rendering"); RNA_def_property_ui_icon(prop, ICON_SCENE, 0); diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index cff274d81eb..9d6d3b4cd2a 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -294,7 +294,7 @@ static void rna_Cache_active_point_cache_index_set(struct PointerRNA *ptr, int v BLI_freelistN(&pidlist); } -static void rna_PointCache_step_range(PointerRNA *ptr, int *min, int *max) +static void rna_PointCache_frame_step_range(PointerRNA *ptr, int *min, int *max) { Object *ob = ptr->id.data; PointCache *cache= ptr->data; @@ -714,9 +714,10 @@ static void rna_def_pointcache(BlenderRNA *brna) RNA_def_property_range(prop, 1, MAXFRAME); RNA_def_property_ui_text(prop, "End", "Frame on which the simulation stops"); - prop= RNA_def_property(srna, "step", PROP_INT, PROP_NONE); + prop= RNA_def_property(srna, "frame_step", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "step"); RNA_def_property_range(prop, 1, 20); - RNA_def_property_int_funcs(prop, NULL, NULL, "rna_PointCache_step_range"); + RNA_def_property_int_funcs(prop, NULL, NULL, "rna_PointCache_frame_step_range"); RNA_def_property_ui_text(prop, "Cache Step", "Number of frames between cached frames"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_change"); @@ -735,7 +736,7 @@ static void rna_def_pointcache(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_BAKING); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - prop= RNA_def_property(srna, "disk_cache", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_disk_cache", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_DISK_CACHE); RNA_def_property_ui_text(prop, "Disk Cache", "Save cache files to disk (.blend file must be saved first)"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_toggle_disk_cache"); @@ -760,7 +761,7 @@ static void rna_def_pointcache(BlenderRNA *brna) RNA_def_property_ui_text(prop, "File Path", "Cache file path"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_idname_change"); - prop= RNA_def_property(srna, "quick_cache", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_quick_cache", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_QUICK_CACHE); RNA_def_property_ui_text(prop, "Quick Cache", "Update simulation with cache steps"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_change"); @@ -770,7 +771,7 @@ static void rna_def_pointcache(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Cache Info", "Info on current cache status"); - prop= RNA_def_property(srna, "external", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_external", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_EXTERNAL); RNA_def_property_ui_text(prop, "External", "Read cache from an external location"); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_idname_change"); @@ -949,7 +950,7 @@ static void rna_def_effector_weight(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Wind", "Wind effector weight"); RNA_def_property_update(prop, 0, "rna_EffectorWeight_update"); - prop= RNA_def_property(srna, "curveguide", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "curve_guide", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "weight[5]"); RNA_def_property_range(prop, -200.0f, 200.0f); RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 3); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 3b3a537f69f..16696c25875 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -876,7 +876,7 @@ static void rna_def_particle(BlenderRNA *brna) // float fuv[4], foffset; /* coordinates on face/edge number "num" and depth along*/ // /* face normal for volume emission */ - prop= RNA_def_property(srna, "birthtime", PROP_FLOAT, PROP_TIME); + prop= RNA_def_property(srna, "birth_time", PROP_FLOAT, PROP_TIME); RNA_def_property_float_sdna(prop, NULL, "time"); // RNA_def_property_range(prop, lowerLimitf, upperLimitf); RNA_def_property_ui_text(prop, "Birth Time", ""); @@ -902,7 +902,7 @@ static void rna_def_particle(BlenderRNA *brna) // int totkey; /* flag */ - prop= RNA_def_property(srna, "is_existing", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_exist", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", PARS_UNEXIST); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Exists", ""); @@ -2055,12 +2055,13 @@ static void rna_def_particle_target(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Duration", ""); RNA_def_property_update(prop, 0, "rna_Particle_target_redo"); - prop= RNA_def_property(srna, "valid", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_valid", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PTARGET_VALID); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Valid", "Keyed particles target is valid"); - prop= RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "alliance", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "mode"); RNA_def_property_enum_items(prop, mode_items); RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); RNA_def_property_ui_text(prop, "Mode", ""); diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index 573f460e2bf..7f9260a7ffa 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -320,7 +320,7 @@ static void rna_def_smoke_flow_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Initial Velocity", "Smoke inherits it's velocity from the emitter particle"); RNA_def_property_update(prop, 0, NULL); - prop= RNA_def_property(srna, "velocity_multiplier", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "velocity_factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "vel_multi"); RNA_def_property_range(prop, -2.0, 2.0); RNA_def_property_ui_range(prop, -2.0, 2.0, 0.05, 5); diff --git a/source/blender/makesrna/intern/rna_text.c b/source/blender/makesrna/intern/rna_text.c index 81256e7b87a..15e7ce525ba 100644 --- a/source/blender/makesrna/intern/rna_text.c +++ b/source/blender/makesrna/intern/rna_text.c @@ -139,11 +139,13 @@ static void rna_def_text_marker(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Line", "Line in which the marker is located"); - prop= RNA_def_property(srna, "start", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "character_index_start", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "start"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Start", "Start position of the marker in the line"); - prop= RNA_def_property(srna, "end", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "character_index_end", PROP_INT, PROP_UNSIGNED); + RNA_def_property_int_sdna(prop, NULL, "end"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "End", "Start position of the marker in the line"); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 284473e90a5..732a5a1a9d5 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -615,7 +615,7 @@ static void rna_def_environment_map(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Zoom", ""); RNA_def_property_update(prop, 0, "rna_Texture_update"); - prop= RNA_def_property(srna, "ignore_layers", PROP_BOOLEAN, PROP_LAYER_MEMBER); + prop= RNA_def_property(srna, "layers_ignore", PROP_BOOLEAN, PROP_LAYER_MEMBER); RNA_def_property_boolean_sdna(prop, NULL, "notlay", 1); RNA_def_property_array(prop, 20); RNA_def_property_ui_text(prop, "Ignore Layers", "Hide objects on these layers when generating the Environment Map"); diff --git a/source/blender/makesrna/rna_cleanup/rna_properties.txt b/source/blender/makesrna/rna_cleanup/rna_properties.txt index 7cacae1d026..313138a8172 100644 --- a/source/blender/makesrna/rna_cleanup/rna_properties.txt +++ b/source/blender/makesrna/rna_cleanup/rna_properties.txt @@ -2185,7 +2185,7 @@ #+ * MeshStringProperty.value -> value: string "NO DESCRIPTION" #+ * MeshStringPropertyLayer.data -> data: collection, "(read-only)" #+ * MeshStringPropertyLayer.name -> name: string "NO DESCRIPTION" - + * MeshTextureFace.transp -> alpha_mode: enum "Transparency blending mode" + + * MeshTextureFace.transp -> blend_type: enum "Transparency blending mode" + * MeshTextureFace.invisible -> hide: boolean "Make face invisible" #+ * MeshTextureFace.image -> image: pointer "NO DESCRIPTION" + * MeshTextureFace.uv_pinned -> pin_uv: boolean[4] "NO DESCRIPTION" @@ -2198,7 +2198,7 @@ + * MeshTextureFace.halo -> use_halo: boolean "Screen aligned billboard" + * MeshTextureFace.light -> use_light: boolean "Use light for face" + * MeshTextureFace.object_color -> use_object_color: boolean "Use ObColor instead of vertex colors" - + * MeshTextureFace.shadow -> use_shadow_face: boolean "Face is used for shadow" + + * MeshTextureFace.shadow -> use_shadow_cast: boolean "Face is used for shadow" + * MeshTextureFace.tex -> use_texture: boolean "Render face with texture" + * MeshTextureFace.twoside -> use_twoside: boolean "Render face two-sided" #+ * MeshTextureFace.uv -> uv: float[8] "NO DESCRIPTION" @@ -2235,7 +2235,7 @@ #Modifier.show_on_cage -> show_on_cage: boolean "Enable direct editing of modifier control cage" #Modifier.show_viewport -> show_viewport: boolean "Realtime display of a modifier" #+ * Modifier.type -> type: enum, "(read-only)" - + * Modifier.render -> use_render: boolean "Use modifier during rendering" + + * Modifier.render -> show_render: boolean "Use modifier during rendering" + * Modifier|ArmatureModifier.invert -> invert_vertex_group: boolean "Invert vertex group influence" #+ * Modifier|ArmatureModifier.object -> object: pointer "Armature object to deform with" #+ * Modifier|ArmatureModifier.use_bone_envelopes -> use_bone_envelopes: boolean "NO DESCRIPTION" diff --git a/source/blender/makesrna/rna_cleanup/rna_update.sh b/source/blender/makesrna/rna_cleanup/rna_update.sh index 5dc70ad947d..04d4bbcb0e4 100755 --- a/source/blender/makesrna/rna_cleanup/rna_update.sh +++ b/source/blender/makesrna/rna_cleanup/rna_update.sh @@ -6,6 +6,8 @@ cd ./source/blender/makesrna/rna_cleanup/ ./rna_cleaner_merge.py out_work.py rna_properties_work.py ./rna_cleaner.py out_work_merged.py ./rna_cleaner.py out_work_lost.py -mv out_work_merged_work.txt rna_properties_new.txt +mv out_work_merged_work.txt rna_properties.txt # overwrite mv out_work_lost_work.txt rna_properties_lost.txt -echo "Updated: rna_properties_new.txt rna_properties_lost.txt"
\ No newline at end of file +cat rna_properties.txt | grep -v "^#" > rna_properties_edits.txt +./rna_cleaner.py rna_properties.txt +echo "Updated: rna_properties.txt rna_properties_edits.txt rna_properties_lost.txt "
\ No newline at end of file |