From 55ed0f050764fd91044d566005e3c10828a24eb7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 18 Aug 2010 08:26:18 +0000 Subject: more rna renaming. --- release/scripts/modules/rna_info.py | 2 +- release/scripts/op/fcurve_euler_filter.py | 6 +- release/scripts/ui/properties_animviz.py | 2 +- release/scripts/ui/properties_data_bone.py | 30 +++---- release/scripts/ui/properties_data_curve.py | 4 +- release/scripts/ui/properties_data_modifier.py | 2 +- release/scripts/ui/properties_game.py | 10 +-- release/scripts/ui/properties_particle.py | 12 +-- release/scripts/ui/properties_physics_cloth.py | 2 +- release/scripts/ui/properties_physics_common.py | 6 +- release/scripts/ui/properties_physics_smoke.py | 6 +- release/scripts/ui/properties_physics_softbody.py | 2 +- release/scripts/ui/properties_texture.py | 10 +-- release/scripts/ui/space_info.py | 2 +- release/scripts/ui/space_nla.py | 2 +- release/scripts/ui/space_sequencer.py | 2 +- release/scripts/ui/space_time.py | 2 +- release/scripts/ui/space_view3d.py | 2 +- release/scripts/ui/space_view3d_toolbar.py | 18 ++--- source/blender/editors/space_graph/graph_buttons.c | 4 +- source/blender/makesrna/intern/rna_animviz.c | 4 +- source/blender/makesrna/intern/rna_constraint.c | 6 +- source/blender/makesrna/intern/rna_curve.c | 12 +-- source/blender/makesrna/intern/rna_fcurve.c | 8 +- source/blender/makesrna/intern/rna_key.c | 4 +- source/blender/makesrna/intern/rna_mesh.c | 12 +-- source/blender/makesrna/intern/rna_modifier.c | 2 +- source/blender/makesrna/intern/rna_object_force.c | 8 +- source/blender/makesrna/intern/rna_particle.c | 13 +-- source/blender/makesrna/intern/rna_pose.c | 2 +- source/blender/makesrna/intern/rna_rna.c | 4 +- source/blender/makesrna/intern/rna_scene.c | 6 +- source/blender/makesrna/intern/rna_sculpt_paint.c | 4 +- source/blender/makesrna/intern/rna_sequencer.c | 2 +- source/blender/makesrna/intern/rna_smoke.c | 2 +- source/blender/makesrna/intern/rna_text.c | 4 +- source/blender/makesrna/intern/rna_texture.c | 4 +- .../makesrna/rna_cleanup/rna_properties.txt | 92 +++++++++++----------- source/gameengine/Converter/BL_ArmatureChannel.cpp | 2 +- .../gameengine/Converter/BL_ArmatureConstraint.cpp | 4 +- 40 files changed, 161 insertions(+), 160 deletions(-) diff --git a/release/scripts/modules/rna_info.py b/release/scripts/modules/rna_info.py index fe53d2961be..98cd4bcbd3a 100644 --- a/release/scripts/modules/rna_info.py +++ b/release/scripts/modules/rna_info.py @@ -314,7 +314,7 @@ class InfoFunctionRNA: for rna_prop in rna_func.parameters.values(): prop = GetInfoPropertyRNA(rna_prop, parent_id) - if rna_prop.use_output: + if rna_prop.is_output: self.return_values.append(prop) else: self.args.append(prop) diff --git a/release/scripts/op/fcurve_euler_filter.py b/release/scripts/op/fcurve_euler_filter.py index c6f5ddd12e4..a2730e16843 100644 --- a/release/scripts/op/fcurve_euler_filter.py +++ b/release/scripts/op/fcurve_euler_filter.py @@ -7,7 +7,7 @@ def main(context): keys = [] for k in fcv.keyframe_points: - keys.append([k.handle1.copy(), k.co.copy(), k.handle2.copy()]) + keys.append([k.handle_left.copy(), k.co.copy(), k.handle_right.copy()]) print(keys) for i in range(len(keys)): @@ -34,9 +34,9 @@ def main(context): for i in range(len(keys)): for x in range(2): - fcv.keyframe_points[i].handle1[x] = keys[i][0][x] + fcv.keyframe_points[i].handle_left[x] = keys[i][0][x] fcv.keyframe_points[i].co[x] = keys[i][1][x] - fcv.keyframe_points[i].handle2[x] = keys[i][2][x] + fcv.keyframe_points[i].handle_right[x] = keys[i][2][x] flist = bpy.context.active_object.animation_data.action.fcurves for f in flist: diff --git a/release/scripts/ui/properties_animviz.py b/release/scripts/ui/properties_animviz.py index a3343559622..bbd849e4daf 100644 --- a/release/scripts/ui/properties_animviz.py +++ b/release/scripts/ui/properties_animviz.py @@ -32,7 +32,7 @@ class MotionPathButtonsPanel(): def draw_settings(self, context, avs, bones=False): layout = self.layout - mps = avs.motion_paths + mps = avs.motion_path layout.prop(mps, "type", expand=True) diff --git a/release/scripts/ui/properties_data_bone.py b/release/scripts/ui/properties_data_bone.py index 7b49148ebd8..6f9a96ec27b 100644 --- a/release/scripts/ui/properties_data_bone.py +++ b/release/scripts/ui/properties_data_bone.py @@ -225,68 +225,68 @@ class BONE_PT_inverse_kinematics(BoneButtonsPanel, bpy.types.Panel): split = layout.split(percentage=0.25) split.prop(pchan, "ik_dof_x", text="X") - split.active = pchan.has_ik + split.active = pchan.is_in_ik_chain row = split.row() row.prop(pchan, "ik_stiffness_x", text="Stiffness", slider=True) - row.active = pchan.ik_dof_x and pchan.has_ik + row.active = pchan.ik_dof_x and pchan.is_in_ik_chain split = layout.split(percentage=0.25) sub = split.row() sub.prop(pchan, "ik_limit_x", text="Limit") - sub.active = pchan.ik_dof_x and pchan.has_ik + sub.active = pchan.ik_dof_x and pchan.is_in_ik_chain sub = split.row(align=True) sub.prop(pchan, "ik_min_x", text="") sub.prop(pchan, "ik_max_x", text="") - sub.active = pchan.ik_dof_x and pchan.ik_limit_x and pchan.has_ik + sub.active = pchan.ik_dof_x and pchan.ik_limit_x and pchan.is_in_ik_chain split = layout.split(percentage=0.25) split.prop(pchan, "ik_dof_y", text="Y") - split.active = pchan.has_ik and pchan.has_ik + split.active = pchan.is_in_ik_chain and pchan.is_in_ik_chain row = split.row() row.prop(pchan, "ik_stiffness_y", text="Stiffness", slider=True) - row.active = pchan.ik_dof_y and pchan.has_ik + row.active = pchan.ik_dof_y and pchan.is_in_ik_chain split = layout.split(percentage=0.25) sub = split.row() sub.prop(pchan, "ik_limit_y", text="Limit") - sub.active = pchan.ik_dof_y and pchan.has_ik + sub.active = pchan.ik_dof_y and pchan.is_in_ik_chain sub = split.row(align=True) sub.prop(pchan, "ik_min_y", text="") sub.prop(pchan, "ik_max_y", text="") - sub.active = pchan.ik_dof_y and pchan.ik_limit_y and pchan.has_ik + sub.active = pchan.ik_dof_y and pchan.ik_limit_y and pchan.is_in_ik_chain split = layout.split(percentage=0.25) split.prop(pchan, "ik_dof_z", text="Z") - split.active = pchan.has_ik and pchan.has_ik + split.active = pchan.is_in_ik_chain and pchan.is_in_ik_chain sub = split.row() sub.prop(pchan, "ik_stiffness_z", text="Stiffness", slider=True) - sub.active = pchan.ik_dof_z and pchan.has_ik + sub.active = pchan.ik_dof_z and pchan.is_in_ik_chain split = layout.split(percentage=0.25) sub = split.row() sub.prop(pchan, "ik_limit_z", text="Limit") - sub.active = pchan.ik_dof_z and pchan.has_ik + sub.active = pchan.ik_dof_z and pchan.is_in_ik_chain sub = split.row(align=True) sub.prop(pchan, "ik_min_z", text="") sub.prop(pchan, "ik_max_z", text="") - sub.active = pchan.ik_dof_z and pchan.ik_limit_z and pchan.has_ik + sub.active = pchan.ik_dof_z and pchan.ik_limit_z and pchan.is_in_ik_chain split = layout.split() split.prop(pchan, "ik_stretch", text="Stretch", slider=True) split.label() - split.active = pchan.has_ik + split.active = pchan.is_in_ik_chain if ob.pose.ik_solver == 'ITASC': split = layout.split() col = split.column() col.prop(pchan, "ik_rot_control", text="Control Rotation") - col.active = pchan.has_ik + col.active = pchan.is_in_ik_chain col = split.column() col.prop(pchan, "ik_rot_weight", text="Weight", slider=True) - col.active = pchan.has_ik + col.active = pchan.is_in_ik_chain # not supported yet #row = layout.row() #row.prop(pchan, "ik_lin_control", text="Joint Size") diff --git a/release/scripts/ui/properties_data_curve.py b/release/scripts/ui/properties_data_curve.py index ae8110f1298..b3a9f025f54 100644 --- a/release/scripts/ui/properties_data_curve.py +++ b/release/scripts/ui/properties_data_curve.py @@ -287,7 +287,7 @@ class DATA_PT_font(CurveButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Text on Curve:") - col.prop(text, "text_on_curve", text="") + col.prop(text, "follow_curve", text="") split = layout.split() @@ -357,7 +357,7 @@ class DATA_PT_textboxes(CurveButtonsPanel, bpy.types.Panel): col.operator("font.textbox_add", icon='ZOOMIN') col = split.column() - for i, box in enumerate(text.textboxes): + for i, box in enumerate(text.text_boxes): boxy = layout.box() diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py index 0bc6525f244..42fe9e26af3 100644 --- a/release/scripts/ui/properties_data_modifier.py +++ b/release/scripts/ui/properties_data_modifier.py @@ -687,7 +687,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): if md.texture_coordinates == 'MAP_UV' and ob.type == 'MESH': layout.prop_object(md, "uv_layer", ob.data, "uv_textures") elif md.texture_coordinates == 'OBJECT': - layout.prop(md, "texture_coordinates_object") + layout.prop(md, "texture_coords_object") layout.separator() diff --git a/release/scripts/ui/properties_game.py b/release/scripts/ui/properties_game.py index 4d45aca88b1..8ca4f9a3d11 100644 --- a/release/scripts/ui/properties_game.py +++ b/release/scripts/ui/properties_game.py @@ -215,7 +215,7 @@ class RENDER_PT_game_player(RenderButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings layout.prop(gs, "show_fullscreen") @@ -248,7 +248,7 @@ class RENDER_PT_game_stereo(RenderButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings stereo_mode = gs.stereo # stereo options: @@ -302,7 +302,7 @@ class RENDER_PT_game_shading(RenderButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings layout.prop(gs, "material_mode", expand=True) @@ -327,7 +327,7 @@ class RENDER_PT_game_performance(RenderButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings split = layout.split() @@ -454,7 +454,7 @@ class WORLD_PT_game_physics(WorldButtonsPanel, bpy.types.Panel): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings layout.prop(gs, "physics_engine") if gs.physics_engine != 'NONE': diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py index 01d7f5895ae..8d306385074 100644 --- a/release/scripts/ui/properties_particle.py +++ b/release/scripts/ui/properties_particle.py @@ -27,7 +27,7 @@ from properties_physics_common import basic_force_field_falloff_ui def particle_panel_enabled(context, psys): - return (psys.point_cache.baked is False) and (not psys.edited) and (not context.particle_system_editable) + return (psys.point_cache.is_baked is False) and (not psys.edited) and (not context.particle_system_editable) def particle_panel_poll(cls, context): @@ -116,15 +116,15 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, bpy.types.Panel): split = layout.split(percentage=0.65) if part.type == 'HAIR': - if psys.edited: + if psys.is_edited: split.operator("particle.edited_clear", text="Free Edit") else: split.label(text="") row = split.row() row.enabled = particle_panel_enabled(context, psys) row.prop(part, "hair_step") - if psys.edited: - if psys.global_hair: + if psys.is_edited: + if psys.is_global_hair: layout.operator("particle.connect_hair") layout.label(text="Hair is disconnected.") else: @@ -153,7 +153,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, bpy.types.Panel): psys = context.particle_system part = psys.settings - layout.enabled = particle_panel_enabled(context, psys) and not psys.multiple_caches + layout.enabled = particle_panel_enabled(context, psys) and not psys.has_multiple_caches row = layout.row() row.active = part.distribution != 'GRID' @@ -764,7 +764,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, bpy.types.Panel): if part.use_group_count and not part.whole_group: row = layout.row() - row.template_list(part, "dupliweights", part, "active_dupliweight_index") + row.template_list(part, "dupli_weights", part, "active_dupliweight_index") col = row.column() sub = col.row() diff --git a/release/scripts/ui/properties_physics_cloth.py b/release/scripts/ui/properties_physics_cloth.py index b7e5e0f8144..7717c5b41fd 100644 --- a/release/scripts/ui/properties_physics_cloth.py +++ b/release/scripts/ui/properties_physics_cloth.py @@ -25,7 +25,7 @@ from properties_physics_common import effector_weights_ui def cloth_panel_enabled(md): - return md.point_cache.baked is False + return md.point_cache.is_baked is False class CLOTH_MT_presets(bpy.types.Menu): diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/ui/properties_physics_common.py index 81e05c8b0fd..e497492e6ff 100644 --- a/release/scripts/ui/properties_physics_common.py +++ b/release/scripts/ui/properties_physics_common.py @@ -29,7 +29,7 @@ def point_cache_ui(self, context, cache, enabled, cachetype): layout.set_context_pointer("point_cache", cache) row = layout.row() - row.template_list(cache, "point_cache_list", cache, "active_point_cache_index", rows=2) + row.template_list(cache, "point_caches", cache, "active_point_cache_index", rows=2) col = row.column(align=True) col.operator("ptcache.add", icon='ZOOMIN', text="") col.operator("ptcache.remove", icon='ZOOMOUT', text="") @@ -84,13 +84,13 @@ def point_cache_ui(self, context, cache, enabled, cachetype): col = split.column() - if cache.baked == True: + if cache.is_baked == True: col.operator("ptcache.free_bake", text="Free Bake") else: col.operator("ptcache.bake", text="Bake").bake = True sub = col.row() - sub.enabled = (cache.frames_skipped or cache.outdated) and enabled + sub.enabled = (cache.frames_skipped or cache.is_outdated) and enabled sub.operator("ptcache.bake", text="Calculate To Frame").bake = False sub = col.column() diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py index 6d56ec97da4..822eb129b74 100644 --- a/release/scripts/ui/properties_physics_smoke.py +++ b/release/scripts/ui/properties_physics_smoke.py @@ -144,7 +144,7 @@ class PHYSICS_PT_smoke_groups(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Collision Group:") - col.prop(group, "coll_group", text="") + col.prop(group, "collision_group", text="") class PHYSICS_PT_smoke_cache(PhysicButtonsPanel, bpy.types.Panel): @@ -165,7 +165,7 @@ class PHYSICS_PT_smoke_cache(PhysicButtonsPanel, bpy.types.Panel): layout.label(text="Compression:") layout.prop(md, "smoke_cache_comp", expand=True) - point_cache_ui(self, context, cache, (cache.baked is False), 'SMOKE') + point_cache_ui(self, context, cache, (cache.is_baked is False), 'SMOKE') class PHYSICS_PT_smoke_highres(PhysicButtonsPanel, bpy.types.Panel): @@ -221,7 +221,7 @@ class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel, bpy.types.Panel): layout.label(text="Compression:") layout.prop(md, "smoke_cache_high_comp", expand=True) - point_cache_ui(self, context, cache, (cache.baked is False), 'SMOKE') + point_cache_ui(self, context, cache, (cache.is_baked is False), 'SMOKE') class PHYSICS_PT_smoke_field_weights(PhysicButtonsPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py index dd65899337a..887026f97c0 100644 --- a/release/scripts/ui/properties_physics_softbody.py +++ b/release/scripts/ui/properties_physics_softbody.py @@ -25,7 +25,7 @@ from properties_physics_common import effector_weights_ui def softbody_panel_enabled(md): - return (md.point_cache.baked is False) + return (md.point_cache.is_baked is False) class PhysicButtonsPanel(): diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 2306510271a..c3e5dc9fae2 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -850,10 +850,10 @@ class TEXTURE_PT_voxeldata(TextureButtonsPanel, bpy.types.Panel): layout = self.layout tex = context.texture - vd = tex.voxeldata + vd = tex.voxel_data layout.prop(vd, "file_format") - if vd.file_format in ['BLENDER_VOXEL', 'RAW_8BIT']: + if vd.file_format in ('BLENDER_VOXEL', 'RAW_8BIT'): layout.prop(vd, "source_path") if vd.file_format == 'RAW_8BIT': layout.prop(vd, "resolution") @@ -889,7 +889,7 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, bpy.types.Panel): layout = self.layout tex = context.texture - pd = tex.pointdensity + pd = tex.point_density layout.prop(pd, "point_source", expand=True) @@ -945,7 +945,7 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, bpy.types.Panel): layout = self.layout tex = context.texture - pd = tex.pointdensity + pd = tex.point_density layout.prop(pd, "turbulence", text="") @@ -953,7 +953,7 @@ class TEXTURE_PT_pointdensity_turbulence(TextureButtonsPanel, bpy.types.Panel): layout = self.layout tex = context.texture - pd = tex.pointdensity + pd = tex.point_density layout.active = pd.turbulence split = layout.split() diff --git a/release/scripts/ui/space_info.py b/release/scripts/ui/space_info.py index ba101940ff4..62c021354db 100644 --- a/release/scripts/ui/space_info.py +++ b/release/scripts/ui/space_info.py @@ -265,7 +265,7 @@ class INFO_MT_game(bpy.types.Menu): def draw(self, context): layout = self.layout - gs = context.scene.game_data + gs = context.scene.game_settings layout.operator("view3d.game_start") diff --git a/release/scripts/ui/space_nla.py b/release/scripts/ui/space_nla.py index ceabc0af00f..bb979e0573e 100644 --- a/release/scripts/ui/space_nla.py +++ b/release/scripts/ui/space_nla.py @@ -122,7 +122,7 @@ class NLA_MT_edit(bpy.types.Menu): layout.separator() # TODO: names of these tools for 'tweakmode' need changing? - if scene.nla_tweakmode_on: + if scene.is_nla_tweakmode: layout.operator("nla.tweakmode_exit", text="Stop Tweaking Strip Actions") else: layout.operator("nla.tweakmode_enter", text="Start Tweaking Strip Actions") diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index 8f8393051a3..a331e747fdb 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -378,7 +378,7 @@ class SEQUENCER_PT_edit(SequencerButtonsPanel, bpy.types.Panel): row = col.row() row.label(text="Final Length: %s" % bpy.utils.smpte_from_frame(strip.frame_final_length)) row = col.row() - row.active = (frame_current >= strip.frame_start and frame_current <= strip.frame_start + strip.frame_length) + row.active = (frame_current >= strip.frame_start and frame_current <= strip.frame_start + strip.frame_duration) row.label(text="Playhead: %d" % (frame_current - strip.frame_start)) col.label(text="Frame Offset %d:%d" % (strip.frame_offset_start, strip.frame_offset_end)) diff --git a/release/scripts/ui/space_time.py b/release/scripts/ui/space_time.py index 49631399059..6f9bb3154e9 100644 --- a/release/scripts/ui/space_time.py +++ b/release/scripts/ui/space_time.py @@ -77,7 +77,7 @@ class TIME_HT_header(bpy.types.Header): layout.separator() row = layout.row(align=True) - row.prop_object(scene, "active_keying_set", scene, "all_keying_sets", text="") + row.prop_object(scene, "active_keying_set", scene, "keying_sets_all", text="") row.operator("anim.keyframe_insert", text="", icon='KEY_HLT') row.operator("anim.keyframe_delete", text="", icon='KEY_DEHLT') diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index eb868284005..36502564e1f 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -2012,7 +2012,7 @@ class VIEW3D_PT_view3d_display(bpy.types.Panel): layout = self.layout view = context.space_data - gs = context.scene.game_data + gs = context.scene.game_settings ob = context.object col = layout.column() diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py index f889eb99c67..4ff90c53d3c 100644 --- a/release/scripts/ui/space_view3d_toolbar.py +++ b/release/scripts/ui/space_view3d_toolbar.py @@ -1308,37 +1308,37 @@ class VIEW3D_PT_tools_particlemode(View3DPanel, bpy.types.Panel): if md.type == pe.type: ptcache = md.point_cache - if ptcache and len(ptcache.point_cache_list) > 1: - layout.template_list(ptcache, "point_cache_list", ptcache, "active_point_cache_index", type='ICONS') + if ptcache and len(ptcache.point_caches) > 1: + layout.template_list(ptcache, "point_caches", ptcache, "active_point_cache_index", type='ICONS') - if not pe.editable: + if not pe.is_editable: layout.label(text="Point cache must be baked") layout.label(text="to enable editing!") col = layout.column(align=True) - if pe.hair: - col.active = pe.editable + if pe.is_hair: + col.active = pe.is_editable col.prop(pe, "emitter_deflect", text="Deflect emitter") sub = col.row() sub.active = pe.emitter_deflect sub.prop(pe, "emitter_distance", text="Distance") col = layout.column(align=True) - col.active = pe.editable + col.active = pe.is_editable col.label(text="Keep:") col.prop(pe, "keep_lengths", text="Lengths") col.prop(pe, "keep_root", text="Root") - if not pe.hair: + if not pe.is_hair: col.label(text="Correct:") col.prop(pe, "auto_velocity", text="Velocity") col.prop(ob.data, "use_mirror_x") col = layout.column(align=True) - col.active = pe.editable + col.active = pe.is_editable col.label(text="Draw:") col.prop(pe, "draw_step", text="Path Steps") - if pe.hair: + if pe.is_hair: col.prop(pe, "show_particles", text="Children") else: if pe.type == 'PARTICLES': diff --git a/source/blender/editors/space_graph/graph_buttons.c b/source/blender/editors/space_graph/graph_buttons.c index caa91d6853c..b333846ac96 100644 --- a/source/blender/editors/space_graph/graph_buttons.c +++ b/source/blender/editors/space_graph/graph_buttons.c @@ -272,11 +272,11 @@ static void graph_panel_key_properties(const bContext *C, Panel *pa) /* previous handle - only if previous was Bezier interpolation */ if ((prevbezt) && (prevbezt->ipo == BEZT_IPO_BEZ)) - uiItemR(col, &bezt_ptr, "handle1", 0, NULL, 0); + uiItemR(col, &bezt_ptr, "handle_left", 0, NULL, 0); /* next handle - only if current is Bezier interpolation */ if (bezt->ipo == BEZT_IPO_BEZ) - uiItemR(col, &bezt_ptr, "handle2", 0, NULL, 0); + uiItemR(col, &bezt_ptr, "handle_right", 0, NULL, 0); } else uiItemL(layout, "No active keyframe on F-Curve", 0); diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c index 7f23f969938..56b1922b90f 100644 --- a/source/blender/makesrna/intern/rna_animviz.c +++ b/source/blender/makesrna/intern/rna_animviz.c @@ -325,14 +325,14 @@ static void rna_def_animviz(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Animation Visualisation", "Settings for the visualisation of motion"); /* onion-skinning settings (nested struct) */ - prop= RNA_def_property(srna, "onion_skinning", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "onion_skin_frames", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "AnimVizOnionSkinning"); RNA_def_property_pointer_funcs(prop, "rna_AnimViz_onion_skinning_get", NULL, NULL, NULL); RNA_def_property_ui_text(prop, "Onion Skinning", "Onion Skinning (ghosting) settings for visualisation"); /* motion path settings (nested struct) */ - prop= RNA_def_property(srna, "motion_paths", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "motion_path", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_struct_type(prop, "AnimVizMotionPaths"); RNA_def_property_pointer_funcs(prop, "rna_AnimViz_motion_paths_get", NULL, NULL, NULL); diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 230344a6d33..d1319d99805 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -452,7 +452,7 @@ static void rna_def_constraint_python(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Use Targets", "Use the targets indicated in the constraint panel"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_dependency_update"); - prop= RNA_def_property(srna, "script_error", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "has_script_error", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PYCON_SCRIPTERROR); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Script Error", "The linked Python script has thrown an error"); @@ -1972,12 +1972,12 @@ void RNA_def_constraint(BlenderRNA *brna) RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_influence_update"); /* readonly values */ - prop= RNA_def_property(srna, "lin_error", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "error_location", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "lin_error"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Lin error", "Amount of residual error in Blender space unit for constraints that work on position"); - prop= RNA_def_property(srna, "rot_error", PROP_FLOAT, PROP_NONE); + prop= RNA_def_property(srna, "error_rotation", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "rot_error"); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Rot error", "Amount of residual error in radiant for constraints that work on orientation"); diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index a1ac39a52de..b26c12bed09 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -623,20 +623,20 @@ static void rna_def_beztriple(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Curve_update_data"); /* Enums */ - prop= RNA_def_property(srna, "handle1_type", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "handle_left_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "h1"); RNA_def_property_enum_items(prop, beztriple_handle_type_items); RNA_def_property_ui_text(prop, "Handle 1 Type", "Handle types"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "handle2_type", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "handle_right_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "h2"); RNA_def_property_enum_items(prop, beztriple_handle_type_items); RNA_def_property_ui_text(prop, "Handle 2 Type", "Handle types"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); /* Vector values */ - prop= RNA_def_property(srna, "handle1", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "handle_left", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 3); RNA_def_property_float_funcs(prop, "rna_BezTriple_handle1_get", "rna_BezTriple_handle1_set", NULL); RNA_def_property_ui_text(prop, "Handle 1", "Coordinates of the first handle"); @@ -648,7 +648,7 @@ static void rna_def_beztriple(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Control Point", "Coordinates of the control point"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "handle2", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "handle_right", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 3); RNA_def_property_float_funcs(prop, "rna_BezTriple_handle2_get", "rna_BezTriple_handle2_set", NULL); RNA_def_property_ui_text(prop, "Handle 2", "Coordinates of the second handle"); @@ -808,7 +808,7 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna) RNA_def_property_ui_text(prop, "Underline Thickness", ""); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "textboxes", PROP_COLLECTION, PROP_NONE); + prop= RNA_def_property(srna, "text_boxes", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "tb", "totbox"); RNA_def_property_struct_type(prop, "TextBox"); RNA_def_property_ui_text(prop, "Textboxes", ""); @@ -837,7 +837,7 @@ static void rna_def_font(BlenderRNA *brna, StructRNA *srna) RNA_def_property_ui_text(prop, "Character Info", "Stores the style of each character"); /* pointers */ - prop= RNA_def_property(srna, "text_on_curve", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "follow_curve", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "textoncurve"); RNA_def_property_pointer_funcs(prop, NULL, NULL, NULL, "rna_Curve_otherObject_poll"); RNA_def_property_flag(prop, PROP_EDITABLE); diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index 7e4a0344c05..acb80f96679 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -1200,13 +1200,13 @@ static void rna_def_fkeyframe(BlenderRNA *brna) RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL); /* Enums */ - prop= RNA_def_property(srna, "handle1_type", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "handle_left_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "h1"); RNA_def_property_enum_items(prop, beztriple_handle_type_items); RNA_def_property_ui_text(prop, "Handle 1 Type", "Handle types"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_PROP, NULL); - prop= RNA_def_property(srna, "handle2_type", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "handle_right_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "h2"); RNA_def_property_enum_items(prop, beztriple_handle_type_items); RNA_def_property_ui_text(prop, "Handle 2 Type", "Handle types"); @@ -1225,7 +1225,7 @@ static void rna_def_fkeyframe(BlenderRNA *brna) RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_PROP, NULL); /* Vector values */ - prop= RNA_def_property(srna, "handle1", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "handle_left", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 2); RNA_def_property_float_funcs(prop, "rna_FKeyframe_handle1_get", "rna_FKeyframe_handle1_set", NULL); RNA_def_property_ui_text(prop, "Handle 1", "Coordinates of the first handle"); @@ -1237,7 +1237,7 @@ static void rna_def_fkeyframe(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Control Point", "Coordinates of the control point"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_EDITED, NULL); - prop= RNA_def_property(srna, "handle2", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "handle_right", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 2); RNA_def_property_float_funcs(prop, "rna_FKeyframe_handle2_get", "rna_FKeyframe_handle2_set", NULL); RNA_def_property_ui_text(prop, "Handle 2", "Coordinates of the second handle"); diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c index 7746d79f294..970c825d30b 100644 --- a/source/blender/makesrna/intern/rna_key.c +++ b/source/blender/makesrna/intern/rna_key.c @@ -363,13 +363,13 @@ static void rna_def_keydata(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Location", ""); RNA_def_property_update(prop, 0, "rna_Key_update_data"); - prop= RNA_def_property(srna, "handle_1_co", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "handle_left", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 3); RNA_def_property_float_funcs(prop, "rna_ShapeKeyBezierPoint_handle_1_co_get", "rna_ShapeKeyBezierPoint_handle_1_co_set", NULL); RNA_def_property_ui_text(prop, "Handle 1 Location", ""); RNA_def_property_update(prop, 0, "rna_Key_update_data"); - prop= RNA_def_property(srna, "handle_2_co", PROP_FLOAT, PROP_TRANSLATION); + prop= RNA_def_property(srna, "handle_right", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_array(prop, 3); RNA_def_property_float_funcs(prop, "rna_ShapeKeyBezierPoint_handle_2_co_get", "rna_ShapeKeyBezierPoint_handle_2_co_set", NULL); RNA_def_property_ui_text(prop, "Handle 2 Location", ""); diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index 3dd1f7ac230..358392f5a63 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1025,7 +1025,7 @@ static char *rna_MeshIntPropertyLayer_path(PointerRNA *ptr) static char *rna_MeshIntProperty_path(PointerRNA *ptr) { - return rna_CustomDataData_path(ptr, "int_layers", CD_MCOL); + return rna_CustomDataData_path(ptr, "layers_int", CD_MCOL); } static char *rna_MeshFloatPropertyLayer_path(PointerRNA *ptr) @@ -1035,7 +1035,7 @@ static char *rna_MeshFloatPropertyLayer_path(PointerRNA *ptr) static char *rna_MeshFloatProperty_path(PointerRNA *ptr) { - return rna_CustomDataData_path(ptr, "float_layers", CD_MCOL); + return rna_CustomDataData_path(ptr, "layers_float", CD_MCOL); } static char *rna_MeshStringPropertyLayer_path(PointerRNA *ptr) @@ -1045,7 +1045,7 @@ static char *rna_MeshStringPropertyLayer_path(PointerRNA *ptr) static char *rna_MeshStringProperty_path(PointerRNA *ptr) { - return rna_CustomDataData_path(ptr, "string_layers", CD_MCOL); + return rna_CustomDataData_path(ptr, "layers_string", CD_MCOL); } static int rna_Mesh_tot_vert_get(PointerRNA *ptr) @@ -1724,19 +1724,19 @@ static void rna_def_mesh(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Active Vertex Color Index", "Active vertex color index"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "float_layers", PROP_COLLECTION, PROP_NONE); + prop= RNA_def_property(srna, "layers_float", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_float_layers_begin", 0, 0, 0, "rna_Mesh_float_layers_length", 0, 0); RNA_def_property_struct_type(prop, "MeshFloatPropertyLayer"); RNA_def_property_ui_text(prop, "Float Property Layers", ""); - prop= RNA_def_property(srna, "int_layers", PROP_COLLECTION, PROP_NONE); + prop= RNA_def_property(srna, "layers_int", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_int_layers_begin", 0, 0, 0, "rna_Mesh_int_layers_length", 0, 0); RNA_def_property_struct_type(prop, "MeshIntPropertyLayer"); RNA_def_property_ui_text(prop, "Int Property Layers", ""); - prop= RNA_def_property(srna, "string_layers", PROP_COLLECTION, PROP_NONE); + prop= RNA_def_property(srna, "layers_string", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer"); RNA_def_property_collection_funcs(prop, "rna_Mesh_string_layers_begin", 0, 0, 0, "rna_Mesh_string_layers_length", 0, 0); RNA_def_property_struct_type(prop, "MeshStringPropertyLayer"); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index 8dfef7f35fc..00eb39d940b 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -940,7 +940,7 @@ static void rna_def_modifier_wave(BlenderRNA *brna) RNA_def_property_string_funcs(prop, NULL, NULL, "rna_WaveModifier_uvlayer_set"); RNA_def_property_update(prop, 0, "rna_Modifier_update"); - prop= RNA_def_property(srna, "texture_coordinates_object", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "texture_coords_object", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "map_object"); RNA_def_property_ui_text(prop, "Texture Coordinates Object", ""); RNA_def_property_flag(prop, PROP_EDITABLE|PROP_ID_SELF_CHECK); diff --git a/source/blender/makesrna/intern/rna_object_force.c b/source/blender/makesrna/intern/rna_object_force.c index 7ba1df82c7b..8d35e206122 100644 --- a/source/blender/makesrna/intern/rna_object_force.c +++ b/source/blender/makesrna/intern/rna_object_force.c @@ -727,11 +727,11 @@ static void rna_def_pointcache(BlenderRNA *brna) RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_idname_change"); /* flags */ - prop= RNA_def_property(srna, "baked", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_baked", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_BAKED); RNA_def_property_clear_flag(prop, PROP_EDITABLE); - prop= RNA_def_property(srna, "baking", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_baking", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_BAKING); RNA_def_property_clear_flag(prop, PROP_EDITABLE); @@ -740,7 +740,7 @@ static void rna_def_pointcache(BlenderRNA *brna) 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"); - prop= RNA_def_property(srna, "outdated", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_outdated", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PTCACHE_OUTDATED); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Cache is outdated", ""); @@ -780,7 +780,7 @@ static void rna_def_pointcache(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Library Path", "Use this files path when library linked into another file."); RNA_def_property_update(prop, NC_OBJECT, "rna_Cache_idname_change"); - prop= RNA_def_property(srna, "point_cache_list", PROP_COLLECTION, PROP_NONE); + prop= RNA_def_property(srna, "point_caches", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_funcs(prop, "rna_Cache_list_begin", "rna_iterator_listbase_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0); RNA_def_property_struct_type(prop, "PointCache"); RNA_def_property_ui_text(prop, "Point Cache List", "Point cache list"); diff --git a/source/blender/makesrna/intern/rna_particle.c b/source/blender/makesrna/intern/rna_particle.c index 6c030c21f95..bf20dcd8d88 100644 --- a/source/blender/makesrna/intern/rna_particle.c +++ b/source/blender/makesrna/intern/rna_particle.c @@ -863,7 +863,7 @@ static void rna_def_particle(BlenderRNA *brna) /* Hair & Keyed Keys */ - prop= RNA_def_property(srna, "hair", PROP_COLLECTION, PROP_NONE); + prop= RNA_def_property(srna, "is_hair", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "hair", "totkey"); RNA_def_property_struct_type(prop, "ParticleHairKey"); RNA_def_property_ui_text(prop, "Hair", ""); @@ -1960,7 +1960,8 @@ static void rna_def_particle_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Dupli Group", "Show Objects in this Group in place of particles"); RNA_def_property_update(prop, 0, "rna_Particle_redo"); - prop= RNA_def_property(srna, "dupliweights", PROP_COLLECTION, PROP_NONE); + prop= RNA_def_property(srna, "dupli_weights", PROP_COLLECTION, PROP_NONE); + RNA_def_property_collection_sdna(prop, NULL, "dupliweights", NULL); RNA_def_property_struct_type(prop, "ParticleDupliWeight"); RNA_def_property_ui_text(prop, "Dupli Group Weights", "Weights for all of the objects in the dupli group"); @@ -2105,7 +2106,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Particle_reset"); /* hair */ - prop= RNA_def_property(srna, "global_hair", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_global_hair", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", PSYS_GLOBAL_HAIR); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Global Hair", "Hair keys are in global coordinate space"); @@ -2309,7 +2310,7 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_struct_type(prop, "PointCache"); RNA_def_property_ui_text(prop, "Point Cache", ""); - prop= RNA_def_property(srna, "multiple_caches", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "has_multiple_caches", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_ParticleSystem_multiple_caches_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Multiple Caches", "Particle system has multiple point caches"); @@ -2322,12 +2323,12 @@ static void rna_def_particle_system(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_Particle_redo"); /* hair or cache editing */ - prop= RNA_def_property(srna, "editable", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_editable", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_ParticleSystem_editable_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Editable", "Particle system can be edited in particle mode"); - prop= RNA_def_property(srna, "edited", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_edited", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_ParticleSystem_edited_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Edited", "Particle system has been edited in particle mode"); diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index eeb223ed54a..42e0d0c87df 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -806,7 +806,7 @@ static void rna_def_pose_channel(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Pose Tail Position", "Location of tail of the channel's bone"); /* IK Settings */ - prop= RNA_def_property(srna, "has_ik", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_in_ik_chain", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_PoseChannel_has_ik_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Has IK", "Is part of an IK chain"); diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c index 80af5086361..5c8de9c4587 100644 --- a/source/blender/makesrna/intern/rna_rna.c +++ b/source/blender/makesrna/intern/rna_rna.c @@ -1004,7 +1004,7 @@ static void rna_def_property(BlenderRNA *brna) RNA_def_property_boolean_funcs(prop, "rna_Property_is_never_none_get", NULL); RNA_def_property_ui_text(prop, "Never None", "True when this value can't be set to None"); - prop= RNA_def_property(srna, "use_output", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_output", PROP_BOOLEAN, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_boolean_funcs(prop, "rna_Property_use_output_get", NULL); RNA_def_property_ui_text(prop, "Return", "True when this property is an output value from an RNA function"); @@ -1162,7 +1162,7 @@ static void rna_def_string_property(StructRNA *srna) RNA_def_property_string_funcs(prop, "rna_StringProperty_default_get", "rna_StringProperty_default_length", NULL); RNA_def_property_ui_text(prop, "Default", "string default value"); - prop= RNA_def_property(srna, "max_length", PROP_INT, PROP_UNSIGNED); + prop= RNA_def_property(srna, "length_max", PROP_INT, PROP_UNSIGNED); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_int_funcs(prop, "rna_StringProperty_max_length_get", NULL, NULL); RNA_def_property_ui_text(prop, "Maximum Length", "Maximum length of the string, 0 means unlimited"); diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 6a46dfccf25..18f655183fb 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -3048,7 +3048,7 @@ void RNA_def_scene(BlenderRNA *brna) rna_def_animdata_common(srna); /* Readonly Properties */ - prop= RNA_def_property(srna, "nla_tweakmode_on", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_nla_tweakmode", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SCE_NLA_EDIT_ON); RNA_def_property_clear_flag(prop, PROP_EDITABLE); /* DO NOT MAKE THIS EDITABLE, OR NLA EDITOR BREAKS */ RNA_def_property_ui_text(prop, "NLA TweakMode", "Indicates whether there is any action referenced by NLA being edited. Strictly read-only"); @@ -3090,7 +3090,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Absolute Keying Sets", "Absolute Keying Sets for this Scene"); RNA_def_property_update(prop, NC_SCENE|ND_KEYINGSET, NULL); - prop= RNA_def_property(srna, "all_keying_sets", PROP_COLLECTION, PROP_NONE); + prop= RNA_def_property(srna, "keying_sets_all", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_funcs(prop, "rna_Scene_all_keyingsets_begin", "rna_Scene_all_keyingsets_next", "rna_iterator_listbase_end", "rna_iterator_listbase_get", 0, 0, 0); RNA_def_property_struct_type(prop, "KeyingSet"); RNA_def_property_ui_text(prop, "All Keying Sets", "All Keying Sets available for use (builtins and Absolute Keying Sets for this Scene)"); @@ -3185,7 +3185,7 @@ void RNA_def_scene(BlenderRNA *brna) RNA_def_property_update(prop, NC_SCENE, NULL); /* Game Settings */ - prop= RNA_def_property(srna, "game_data", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "game_settings", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_pointer_sdna(prop, NULL, "gm"); RNA_def_property_struct_type(prop, "SceneGameData"); diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 0f851635179..c9e07000f26 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -434,12 +434,12 @@ static void rna_def_particle_edit(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Type", ""); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_ParticleEdit_redo"); - prop= RNA_def_property(srna, "editable", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_editable", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_ParticleEdit_editable_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Editable", "A valid edit mode exists"); - prop= RNA_def_property(srna, "hair", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_hair", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_funcs(prop, "rna_ParticleEdit_hair_get", NULL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Hair", "Editing hair"); diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 48ff98ace78..e31db89a182 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -890,7 +890,7 @@ static void rna_def_sequence(BlenderRNA *brna) RNA_def_property_int_funcs(prop, "rna_Sequence_frame_length_get", "rna_Sequence_frame_length_set",NULL); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER, "rna_Sequence_update"); - prop= RNA_def_property(srna, "frame_length", PROP_INT, PROP_TIME); + prop= RNA_def_property(srna, "frame_duration", PROP_INT, PROP_TIME); RNA_def_property_int_sdna(prop, NULL, "len"); RNA_def_property_clear_flag(prop, PROP_EDITABLE|PROP_ANIMATABLE); RNA_def_property_range(prop, 1, MAXFRAME); diff --git a/source/blender/makesrna/intern/rna_smoke.c b/source/blender/makesrna/intern/rna_smoke.c index 0deaa784015..573f460e2bf 100644 --- a/source/blender/makesrna/intern/rna_smoke.c +++ b/source/blender/makesrna/intern/rna_smoke.c @@ -175,7 +175,7 @@ static void rna_def_smoke_domain_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Heat", "Higher value results in faster rising smoke"); RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_Smoke_reset"); - prop= RNA_def_property(srna, "coll_group", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "collision_group", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "coll_group"); RNA_def_property_struct_type(prop, "Group"); RNA_def_property_flag(prop, PROP_EDITABLE); diff --git a/source/blender/makesrna/intern/rna_text.c b/source/blender/makesrna/intern/rna_text.c index aac76177f5b..81256e7b87a 100644 --- a/source/blender/makesrna/intern/rna_text.c +++ b/source/blender/makesrna/intern/rna_text.c @@ -152,12 +152,12 @@ static void rna_def_text_marker(BlenderRNA *brna) RNA_def_property_range(prop, 0, (int)0xFFFF); RNA_def_property_ui_text(prop, "Group", ""); - prop= RNA_def_property(srna, "temporary", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "is_temporary", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", TMARK_TEMP); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Temporary", "Marker is temporary"); - prop= RNA_def_property(srna, "edit_all", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "use_edit_all", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", TMARK_EDITALL); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Edit All", "Edit all markers of the same group as one"); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 47badc29411..284473e90a5 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -1540,7 +1540,7 @@ static void rna_def_texture_pointdensity(BlenderRNA *brna) RNA_def_struct_sdna(srna, "Tex"); RNA_def_struct_ui_text(srna, "Point Density", "Settings for the Point Density texture"); - prop= RNA_def_property(srna, "pointdensity", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "point_density", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "pd"); RNA_def_property_struct_type(prop, "PointDensity"); RNA_def_property_ui_text(prop, "Point Density", "The point density settings associated with this texture"); @@ -1646,7 +1646,7 @@ static void rna_def_texture_voxeldata(BlenderRNA *brna) RNA_def_struct_sdna(srna, "Tex"); RNA_def_struct_ui_text(srna, "Voxel Data", "Settings for the Voxel Data texture"); - prop= RNA_def_property(srna, "voxeldata", PROP_POINTER, PROP_NONE); + prop= RNA_def_property(srna, "voxel_data", PROP_POINTER, PROP_NONE); RNA_def_property_pointer_sdna(prop, NULL, "vd"); RNA_def_property_struct_type(prop, "VoxelData"); RNA_def_property_ui_text(prop, "Voxel Data", "The voxel data associated with this texture"); diff --git a/source/blender/makesrna/rna_cleanup/rna_properties.txt b/source/blender/makesrna/rna_cleanup/rna_properties.txt index ac3ed5ca383..e13c7fade7e 100644 --- a/source/blender/makesrna/rna_cleanup/rna_properties.txt +++ b/source/blender/makesrna/rna_cleanup/rna_properties.txt @@ -180,8 +180,8 @@ #+ * AnimData.drivers -> drivers: collection, "(read-only) The Drivers/Expressions for this datablock" #+ * AnimData.nla_tracks -> nla_tracks: collection, "(read-only) NLA Tracks (i.e. Animation Layers)" #AnimData.use_nla -> use_nla: boolean "NLA stack is evaluated when evaluating this block" - + * AnimViz.motion_paths -> motion_path: pointer, "(read-only) Motion Path settings for visualisation" - + * AnimViz.onion_skinning -> onion_skin_frames: pointer, "(read-only) Onion Skinning (ghosting) settings for visualisation" +#AnimViz.motion_path -> motion_path: pointer, "(read-only) Motion Path settings for visualisation" +#AnimViz.onion_skin_frames -> onion_skin_frames: pointer, "(read-only) Onion Skinning (ghosting) settings for visualisation" #+ * AnimVizMotionPaths.bake_location -> bake_location: enum "When calculating Bone Paths, use Head or Tips" + * AnimVizMotionPaths.after_current -> frame_after: int "Number of frames to show after the current frame (only for Around Current Frame Onion-skinning method)" + * AnimVizMotionPaths.before_current -> frame_before: int "Number of frames to show before the current frame (only for Around Current Frame Onion-skinning method)" @@ -216,10 +216,10 @@ #+ * BackgroundImage.transparency -> transparency: float "Amount to blend the image against the background color" #+ * BackgroundImage.view_axis -> view_axis: enum "The axis to display the image on" #+ * BezierSplinePoint.co -> co: float[3] "Coordinates of the control point" - + * BezierSplinePoint.handle1 -> handle_left: float[3] "Coordinates of the first handle" - + * BezierSplinePoint.handle1_type -> handle_left_type: enum "Handle types" - + * BezierSplinePoint.handle2 -> handle_right: float[3] "Coordinates of the second handle" - + * BezierSplinePoint.handle2_type -> handle_right_type: enum "Handle types" +#BezierSplinePoint.handle_left -> handle_left: float[3] "Coordinates of the first handle" +#BezierSplinePoint.handle_left_type -> handle_left_type: enum "Handle types" +#BezierSplinePoint.handle_right -> handle_right: float[3] "Coordinates of the second handle" +#BezierSplinePoint.handle_right_type -> handle_right_type: enum "Handle types" #+ * BezierSplinePoint.hide -> hide: boolean "Visibility status" #+ * BezierSplinePoint.radius -> radius: float, "(read-only) Radius for bevelling" #+ * BezierSplinePoint.select_control_point -> select_control_point: boolean "Control point selection status" @@ -366,8 +366,8 @@ #ConsoleLine.body -> body: string "Text in the line" #+ * ConsoleLine.current_character -> current_character: int "NO DESCRIPTION" #+ * Constraint.active -> active: boolean "Constraint is the one being edited" - + * Constraint.lin_error -> error_location: float, "(read-only) Amount of residual error in Blender space unit for constraints that work on position" - + * Constraint.rot_error -> error_rotation: float, "(read-only) Amount of residual error in radiant for constraints that work on orientation" +#Constraint.error_location -> error_location: float, "(read-only) Amount of residual error in Blender space unit for constraints that work on position" +#Constraint.error_rotation -> error_rotation: float, "(read-only) Amount of residual error in radiant for constraints that work on orientation" #+ * Constraint.influence -> influence: float "Amount of influence constraint will have on the final solution" + * Constraint.proxy_local -> is_proxy_local: boolean "Constraint was added in this proxy instance (i.e. did not belong to source Armature)" + * Constraint.disabled -> is_valid: boolean, "(read-only) Constraint has invalid settings and will not be evaluated" @@ -522,7 +522,7 @@ #+ * Constraint|PivotConstraint.subtarget -> subtarget: string "NO DESCRIPTION" #+ * Constraint|PivotConstraint.target -> target: pointer "Target Object, defining the position of the pivot when defined" + * Constraint|PivotConstraint.use_relative_position -> use_relative_location: boolean "Offset will be an absolute point in space instead of relative to the target" - + * Constraint|PythonConstraint.script_error -> has_script_error: boolean, "(read-only) The linked Python script has thrown an error" +#Constraint|PythonConstraint.has_script_error -> has_script_error: boolean, "(read-only) The linked Python script has thrown an error" + * Constraint|PythonConstraint.number_of_targets -> target_count: int "Usually only 1-3 are needed" #+ * Constraint|PythonConstraint.targets -> targets: collection, "(read-only) Target Objects" #+ * Constraint|PythonConstraint.text -> text: pointer "The text object that contains the Python script" @@ -1203,7 +1203,7 @@ #+ * ID|Curve|TextCurve.body_format -> body_format: collection, "(read-only) Stores the style of each character" #+ * ID|Curve|TextCurve.edit_format -> edit_format: pointer, "(read-only) Editing settings character formatting" #+ * ID|Curve|TextCurve.family -> family: string "Use Blender Objects as font characters. Give font objects a common name followed by the character it represents, eg. familya, familyb etc, and turn on Verts Duplication" - + * ID|Curve|TextCurve.text_on_curve -> follow_curve: pointer "Curve deforming text object" +#ID|Curve|TextCurve.follow_curve -> follow_curve: pointer "Curve deforming text object" #+ * ID|Curve|TextCurve.font -> font: pointer "NO DESCRIPTION" #+ * ID|Curve|TextCurve.offset_x -> offset_x: float "Horizontal offset from the object origin" #+ * ID|Curve|TextCurve.offset_y -> offset_y: float "Vertical offset from the object origin" @@ -1213,7 +1213,7 @@ + * ID|Curve|TextCurve.spacing -> space_character: float "NO DESCRIPTION" + * ID|Curve|TextCurve.line_dist -> space_line: float "NO DESCRIPTION" + * ID|Curve|TextCurve.word_spacing -> space_word: float "NO DESCRIPTION" - + * ID|Curve|TextCurve.textboxes -> text_boxes: collection, "(read-only)" +#ID|Curve|TextCurve.text_boxes -> text_boxes: collection, "(read-only)" + * ID|Curve|TextCurve.ul_height -> underline_height: float "NO DESCRIPTION" + * ID|Curve|TextCurve.ul_position -> underline_position: float "Vertical position of underline" + * ID|Curve|TextCurve.fast -> use_fast_edit: boolean "Dont fill polygons while editing" @@ -1438,9 +1438,9 @@ + * ID|Mesh.autosmooth_angle -> auto_smooth_angle: int "Defines maximum angle between face normals that Auto Smooth will operate on" #+ * ID|Mesh.edges -> edges: collection, "(read-only) Edges of the mesh" #+ * ID|Mesh.faces -> faces: collection, "(read-only) Faces of the mesh" - + * ID|Mesh.float_layers -> layers_float: collection, "(read-only)" - + * ID|Mesh.int_layers -> layers_int: collection, "(read-only)" - + * ID|Mesh.string_layers -> layers_string: collection, "(read-only)" +#ID|Mesh.layers_float -> layers_float: collection, "(read-only)" +#ID|Mesh.layers_int -> layers_int: collection, "(read-only)" +#ID|Mesh.layers_string -> layers_string: collection, "(read-only)" #+ * ID|Mesh.materials -> materials: collection, "(read-only)" #+ * ID|Mesh.shape_keys -> shape_keys: pointer, "(read-only)" #ID|Mesh.show_all_edges -> show_all_edges: boolean "Displays all edges for wireframe in all view modes in the 3D view" @@ -1621,7 +1621,7 @@ #+ * ID|ParticleSettings.draw_step -> draw_step: int "How many steps paths are drawn with (power of 2)" #+ * ID|ParticleSettings.dupli_group -> dupli_group: pointer "Show Objects in this Group in place of particles" #+ * ID|ParticleSettings.dupli_object -> dupli_object: pointer "Show this Object in place of particles" - + * ID|ParticleSettings.dupliweights -> dupli_weights: collection, "(read-only) Weights for all of the objects in the dupli group" +#ID|ParticleSettings.dupli_weights -> dupli_weights: collection, "(read-only) Weights for all of the objects in the dupli group" #+ * ID|ParticleSettings.effect_hair -> effect_hair: float "Hair stiffness for effectors" #+ * ID|ParticleSettings.effector_weights -> effector_weights: pointer, "(read-only)" #+ * ID|ParticleSettings.emit_from -> emit_from: enum "Where to emit particles from" @@ -1737,12 +1737,12 @@ + * ID|Scene.preview_range_frame_start -> frame_preview_start: int "Alternative start frame for UI playback" #+ * ID|Scene.frame_start -> frame_start: int "First frame of the playback/rendering range" #+ * ID|Scene.frame_step -> frame_step: int "Number of frames to skip forward while rendering/playing back each frame" - + * ID|Scene.game_data -> game_settings: pointer, "(read-only)" +#ID|Scene.game_settings -> game_settings: pointer, "(read-only)" #+ * ID|Scene.gravity -> gravity: float[3] "Constant acceleration in a given direction" #+ * ID|Scene.grease_pencil -> grease_pencil: pointer "Grease Pencil datablock" - + * ID|Scene.nla_tweakmode_on -> is_nla_tweakmode: boolean, "(read-only) Indicates whether there is any action referenced by NLA being edited. Strictly read-only" +#ID|Scene.is_nla_tweakmode -> is_nla_tweakmode: boolean, "(read-only) Indicates whether there is any action referenced by NLA being edited. Strictly read-only" #+ * ID|Scene.keying_sets -> keying_sets: collection, "(read-only) Absolute Keying Sets for this Scene" - + * ID|Scene.all_keying_sets -> keying_sets_all: collection, "(read-only) All Keying Sets available for use (builtins and Absolute Keying Sets for this Scene)" +#ID|Scene.keying_sets_all -> keying_sets_all: collection, "(read-only) All Keying Sets available for use (builtins and Absolute Keying Sets for this Scene)" #+ * ID|Scene.layers -> layers: boolean[20] "Layers visible when rendering the scene" #+ * ID|Scene.network_render -> network_render: pointer, "(read-only) Network Render Settings" #+ * ID|Scene.nodetree -> nodetree: pointer, "(read-only) Compositing node tree" @@ -1868,7 +1868,7 @@ + * ID|Texture|MusgraveTexture.noise_size -> noise_scale: float "Sets scaling for noise input" #+ * ID|Texture|MusgraveTexture.octaves -> octaves: float "Number of frequencies used" #+ * ID|Texture|MusgraveTexture.offset -> offset: float "The fractal offset" - + * ID|Texture|PointDensityTexture.pointdensity -> point_density: pointer, "(read-only) The point density settings associated with this texture" +#ID|Texture|PointDensityTexture.point_density -> point_density: pointer, "(read-only) The point density settings associated with this texture" #+ * ID|Texture|StucciTexture.noise_basis -> noise_basis: enum "Sets the noise basis used for turbulence" + * ID|Texture|StucciTexture.noise_size -> noise_scale: float "Sets scaling for noise input" #+ * ID|Texture|StucciTexture.noise_type -> noise_type: enum "NO DESCRIPTION" @@ -1886,7 +1886,7 @@ #+ * ID|Texture|VoronoiTexture.weight_4 -> weight_4: float "Voronoi feature weight 4" #+ * ID|Texture|VoxelDataTexture.image -> image: pointer "NO DESCRIPTION" #+ * ID|Texture|VoxelDataTexture.image_user -> image_user: pointer, "(read-only) Parameters defining which layer, pass and frame of the image is displayed" - + * ID|Texture|VoxelDataTexture.voxeldata -> voxel_data: pointer, "(read-only) The voxel data associated with this texture" +#ID|Texture|VoxelDataTexture.voxel_data -> voxel_data: pointer, "(read-only) The voxel data associated with this texture" #+ * ID|Texture|WoodTexture.nabla -> nabla: float "Size of derivative offset used for calculating normal" #+ * ID|Texture|WoodTexture.noise_basis -> noise_basis: enum "Sets the noise basis used for turbulence" + * ID|Texture|WoodTexture.noise_size -> noise_scale: float "Sets scaling for noise input" @@ -1966,10 +1966,10 @@ #+ * KeyMapItem.type -> type: enum "Type of event" #+ * KeyMapItem.value -> value: enum "NO DESCRIPTION" #+ * Keyframe.co -> co: float[2] "Coordinates of the control point" - + * Keyframe.handle1 -> handle_left: float[2] "Coordinates of the first handle" - + * Keyframe.handle1_type -> handle_left_type: enum "Handle types" - + * Keyframe.handle2 -> handle_right: float[2] "Coordinates of the second handle" - + * Keyframe.handle2_type -> handle_right_type: enum "Handle types" +#Keyframe.handle_left -> handle_left: float[2] "Coordinates of the first handle" +#Keyframe.handle_left_type -> handle_left_type: enum "Handle types" +#Keyframe.handle_right -> handle_right: float[2] "Coordinates of the second handle" +#Keyframe.handle_right_type -> handle_right_type: enum "Handle types" #+ * Keyframe.interpolation -> interpolation: enum "Interpolation method to use for segment of the curve from this Keyframe until the next Keyframe" #+ * Keyframe.select_control_point -> select_control_point: boolean "Control point selection status" #+ * Keyframe.select_left_handle -> select_left_handle: boolean "Handle 1 selection status" @@ -2436,7 +2436,7 @@ #+ * Modifier|WaveModifier.start_position_y -> start_position_y: float "NO DESCRIPTION" #+ * Modifier|WaveModifier.texture -> texture: pointer "Texture for modulating the wave" + * Modifier|WaveModifier.texture_coordinates -> texture_coords: enum "Texture coordinates used for modulating input" - + * Modifier|WaveModifier.texture_coordinates_object -> texture_coords_object: pointer "NO DESCRIPTION" +#Modifier|WaveModifier.texture_coords_object -> texture_coords_object: pointer "NO DESCRIPTION" #+ * Modifier|WaveModifier.time_offset -> time_offset: float "Either the starting frame (for positive speed) or ending frame (for negative speed.)" + * Modifier|WaveModifier.cyclic -> use_cyclic: boolean "Cyclic wave effect" + * Modifier|WaveModifier.normals -> use_normal: boolean "Displace along normals" @@ -2743,8 +2743,8 @@ #+ * Particle.angular_velocity -> angular_velocity: float[3] "NO DESCRIPTION" + * Particle.birthtime -> birth_time: float "NO DESCRIPTION" #+ * Particle.die_time -> die_time: float "NO DESCRIPTION" -#+ * Particle.hair -> hair: collection, "(read-only)" + * Particle.is_existing -> is_exist: boolean, "(read-only)" +#Particle.is_hair -> is_hair: collection, "(read-only)" #+ * Particle.is_visible -> is_visible: boolean, "(read-only)" #+ * Particle.keys -> keys: collection, "(read-only)" + * Particle.lifetime -> life_time: float "NO DESCRIPTION" @@ -2771,8 +2771,8 @@ #+ * ParticleEdit.draw_step -> draw_step: int "How many steps to draw the path with" #+ * ParticleEdit.emitter_distance -> emitter_distance: float "Distance to keep particles away from the emitter" #+ * ParticleEdit.fade_frames -> fade_frames: int "How many frames to fade" - + * ParticleEdit.hair -> is_hair: boolean, "(read-only) Editing hair" - + * ParticleEdit.editable -> is_valid: boolean, "(read-only) A valid edit mode exists" +#ParticleEdit.is_editable -> is_editable: boolean, "(read-only) A valid edit mode exists" +#ParticleEdit.is_hair -> is_hair: boolean, "(read-only) Editing hair" #+ * ParticleEdit.object -> object: pointer, "(read-only) The edited object" + * ParticleEdit.selection_mode -> select_mode: enum "Particle select and display mode" #ParticleEdit.show_particles -> show_particles: boolean "Draw actual particles" @@ -2800,7 +2800,7 @@ #+ * ParticleSystem.billboard_time_index_uv -> billboard_time_index_uv: string "UV Layer to control billboard time index (X-Y)" #+ * ParticleSystem.child_particles -> child_particles: collection, "(read-only) Child particles generated by the particle system" #+ * ParticleSystem.cloth -> cloth: pointer, "(read-only) Cloth dynamics for hair" - + * ParticleSystem.multiple_caches -> has_multiple_caches: boolean, "(read-only) Particle system has multiple point caches" +#ParticleSystem.has_multiple_caches -> has_multiple_caches: boolean, "(read-only) Particle system has multiple point caches" + * ParticleSystem.vertex_group_clump_negate -> invert_vertex_group_clump: boolean "Negate the effect of the clump vertex group" + * ParticleSystem.vertex_group_density_negate -> invert_vertex_group_density: boolean "Negate the effect of the density vertex group" + * ParticleSystem.vertex_group_field_negate -> invert_vertex_group_field: boolean "Negate the effect of the field vertex group" @@ -2813,9 +2813,9 @@ + * ParticleSystem.vertex_group_size_negate -> invert_vertex_group_size: boolean "Negate the effect of the size vertex group" + * ParticleSystem.vertex_group_tangent_negate -> invert_vertex_group_tangent: boolean "Negate the effect of the tangent vertex group" + * ParticleSystem.vertex_group_velocity_negate -> invert_vertex_group_velocity: boolean "Negate the effect of the velocity vertex group" - + * ParticleSystem.editable -> is_editable: boolean, "(read-only) Particle system can be edited in particle mode" - + * ParticleSystem.edited -> is_edited: boolean, "(read-only) Particle system has been edited in particle mode" - + * ParticleSystem.global_hair -> is_global_hair: boolean, "(read-only) Hair keys are in global coordinate space" +#ParticleSystem.is_editable -> is_editable: boolean, "(read-only) Particle system can be edited in particle mode" +#ParticleSystem.is_edited -> is_edited: boolean, "(read-only) Particle system has been edited in particle mode" +#ParticleSystem.is_global_hair -> is_global_hair: boolean, "(read-only) Hair keys are in global coordinate space" #+ * ParticleSystem.name -> name: string "Particle system name" #+ * ParticleSystem.parent -> parent: pointer "Use this objects coordinate system instead of global coordinate system" #+ * ParticleSystem.particles -> particles: collection, "(read-only) Particles generated by the particle system" @@ -2854,11 +2854,11 @@ #+ * PointCache.frames_skipped -> frames_skipped: boolean, "(read-only)" #+ * PointCache.index -> index: int "Index number of cache files" #+ * PointCache.info -> info: string, "(read-only) Info on current cache status" - + * PointCache.baked -> is_baked: boolean, "(read-only)" - + * PointCache.baking -> is_baking: boolean, "(read-only)" - + * PointCache.outdated -> is_outdated: boolean, "(read-only)" +#PointCache.is_baked -> is_baked: boolean, "(read-only)" +#PointCache.is_baking -> is_baking: boolean, "(read-only)" +#PointCache.is_outdated -> is_outdated: boolean, "(read-only)" #+ * PointCache.name -> name: string "Cache name" - + * PointCache.point_cache_list -> point_caches: collection, "(read-only) Point cache list" +#PointCache.point_caches -> point_caches: collection, "(read-only) Point cache list" + * PointCache.disk_cache -> use_disk_cache: boolean "Save cache files to disk (.blend file must be saved first)" + * PointCache.external -> use_external: boolean "Read cache from an external location" #+ * PointCache.use_library_path -> use_library_path: boolean "Use this files path when library linked into another file." @@ -2907,7 +2907,7 @@ #+ * PoseBone.ik_stiffness_y -> ik_stiffness_y: float "IK stiffness around the Y axis" #+ * PoseBone.ik_stiffness_z -> ik_stiffness_z: float "IK stiffness around the Z axis" #+ * PoseBone.ik_stretch -> ik_stretch: float "Allow scaling of the bone for IK" - + * PoseBone.has_ik -> is_in_ik_chain: boolean, "(read-only) Is part of an IK chain" +#PoseBone.is_in_ik_chain -> is_in_ik_chain: boolean, "(read-only) Is part of an IK chain" #+ * PoseBone.location -> location: float[3] "NO DESCRIPTION" +NEGATE * PoseBone.ik_dof_x -> lock_ik_x: boolean "Allow movement around the X axis" + * PoseBone.ik_limit_x -> lock_ik_x: boolean "Limit movement around the X axis" @@ -2939,7 +2939,7 @@ #+ * Property.description -> description: string, "(read-only) Description of the property for tooltips" #+ * Property.identifier -> identifier: string, "(read-only) Unique name used in the code and scripting" #+ * Property.is_never_none -> is_never_none: boolean, "(read-only) True when this value cant be set to None" - + * Property.use_output -> is_output: boolean, "(read-only) True when this property is an output value from an RNA function" +#Property.is_output -> is_output: boolean, "(read-only) True when this property is an output value from an RNA function" #+ * Property.is_readonly -> is_readonly: boolean, "(read-only) Property is editable through RNA" #Property.is_registered -> is_registered: boolean, "(read-only) Property is registered as part of type registration" #Property.is_registered_optional -> is_registered_optional: boolean, "(read-only) Property is optionally registered as part of type registration" @@ -2974,7 +2974,7 @@ #+ * Property|IntProperty.step -> step: int, "(read-only) Step size used by number buttons, for floats 1/100th of the step size" #+ * Property|PointerProperty.fixed_type -> fixed_type: pointer, "(read-only) Fixed pointer type, empty if variable type" #+ * Property|StringProperty.default -> default: string, "(read-only) string default value" - + * Property|StringProperty.max_length -> length_max: int, "(read-only) Maximum length of the string, 0 means unlimited" +#Property|StringProperty.length_max -> length_max: int, "(read-only) Maximum length of the string, 0 means unlimited" #+ * RGBANodeSocket.default_value -> default_value: float[4] "Default value of the socket when no link is attached" #+ * RGBANodeSocket.name -> name: string, "(read-only) Socket name" #+ * Region.height -> height: int, "(read-only) Region height" @@ -3313,7 +3313,7 @@ + * Sequence.blend_mode -> blend_type: enum "NO DESCRIPTION" #+ * Sequence.channel -> channel: int "Y position of the sequence strip" #+ * Sequence.effect_fader -> effect_fader: float "NO DESCRIPTION" - + * Sequence.frame_length -> frame_duration: int, "(read-only) The length of the contents of this strip before the handles are applied" +#Sequence.frame_duration -> frame_duration: int, "(read-only) The length of the contents of this strip before the handles are applied" + * Sequence.frame_final_length -> frame_final_duration: int "The length of the contents of this strip before the handles are applied" #+ * Sequence.frame_final_end -> frame_final_end: int "End frame displayed in the sequence editor after offsets are applied" #+ * Sequence.frame_final_start -> frame_final_start: int "Start frame displayed in the sequence editor after offsets are applied, setting this is equivalent to moving the handle, not the actual start frame" @@ -3526,8 +3526,8 @@ #+ * ShapeKey.value -> value: float "Value of shape key at the current frame" #+ * ShapeKey.vertex_group -> vertex_group: string "Vertex weight group, to blend with basis shape" #+ * ShapeKeyBezierPoint.co -> co: float[3] "NO DESCRIPTION" - + * ShapeKeyBezierPoint.handle_1_co -> handle_left: float[3] "NO DESCRIPTION" - + * ShapeKeyBezierPoint.handle_2_co -> handle_right: float[3] "NO DESCRIPTION" +#ShapeKeyBezierPoint.handle_left -> handle_left: float[3] "NO DESCRIPTION" +#ShapeKeyBezierPoint.handle_right -> handle_right: float[3] "NO DESCRIPTION" #+ * ShapeKeyCurvePoint.co -> co: float[3] "NO DESCRIPTION" #+ * ShapeKeyCurvePoint.tilt -> tilt: float "NO DESCRIPTION" #+ * ShapeKeyPoint.co -> co: float[3] "NO DESCRIPTION" @@ -3535,7 +3535,7 @@ #+ * SmokeDomainSettings.amplify -> amplify: int "Enhance the resolution of smoke by this factor using noise" #TODO BETTER NAME * SmokeDomainSettings.beta -> beta: float "Higher value results in faster rising smoke" + * SmokeDomainSettings.smoke_domain_colli -> collision_extents: enum "Selects which domain border will be treated as collision object." - + * SmokeDomainSettings.coll_group -> collision_group: pointer "Limit collisions to this group" +#SmokeDomainSettings.collision_group -> collision_group: pointer "Limit collisions to this group" #+ * SmokeDomainSettings.dissolve_speed -> dissolve_speed: int "Dissolve Speed" #+ * SmokeDomainSettings.eff_group -> eff_group: pointer "Limit effectors to this group" #+ * SmokeDomainSettings.effector_weights -> effector_weights: pointer, "(read-only)" @@ -3842,9 +3842,9 @@ + * TextMarker.start -> character_index_start: int, "(read-only) Start position of the marker in the line" #+ * TextMarker.color -> color: float[4] "Color to display the marker with" #+ * TextMarker.group -> group: int, "(read-only)" - + * TextMarker.temporary -> is_temporary: boolean, "(read-only) Marker is temporary" +#TextMarker.is_temporary -> is_temporary: boolean, "(read-only) Marker is temporary" #+ * TextMarker.line -> line: int, "(read-only) Line in which the marker is located" - + * TextMarker.edit_all -> use_edit_all: boolean, "(read-only) Edit all markers of the same group as one" +#TextMarker.use_edit_all -> use_edit_all: boolean, "(read-only) Edit all markers of the same group as one" #+ * TextureSlot.blend_type -> blend_type: enum "NO DESCRIPTION" #+ * TextureSlot.color -> color: float[3] "The default color for textures that dont return RGB" #+ * TextureSlot.default_value -> default_value: float "Value to use for Ref, Spec, Amb, Emit, Alpha, RayMir, TransLu and Hard" @@ -4602,4 +4602,4 @@ + * WorldStarsSettings.color_randomization -> color_random: float "Randomize star colors" + * WorldStarsSettings.min_distance -> distance_min: float "Minimum distance to the camera for stars" #+ * WorldStarsSettings.size -> size: float "Average screen dimension of stars" -#+ * WorldStarsSettings.use_stars -> use_stars: boolean "Enable starfield generation[651149 refs]" +#+ * WorldStarsSettings.use_stars -> use_stars: boolean "Enable starfield generation[651157 refs]" diff --git a/source/gameengine/Converter/BL_ArmatureChannel.cpp b/source/gameengine/Converter/BL_ArmatureChannel.cpp index 424c8441c0e..4f06628b1c6 100644 --- a/source/gameengine/Converter/BL_ArmatureChannel.cpp +++ b/source/gameengine/Converter/BL_ArmatureChannel.cpp @@ -108,7 +108,7 @@ PyAttributeDef BL_ArmatureChannel::Attributes[] = { /* attributes directly taken from bPoseChannel */ PyAttributeDef BL_ArmatureChannel::AttributesPtr[] = { KX_PYATTRIBUTE_CHAR_RO("name",bPoseChannel,name), - KX_PYATTRIBUTE_FLAG_RO("has_ik",bPoseChannel,flag, POSE_CHAIN), + KX_PYATTRIBUTE_FLAG_RO("is_in_ik_chain",bPoseChannel,flag, POSE_CHAIN), KX_PYATTRIBUTE_FLAG_NEGATIVE_RO("ik_dof_x",bPoseChannel,ikflag, BONE_IK_NO_XDOF), KX_PYATTRIBUTE_FLAG_NEGATIVE_RO("ik_dof_y",bPoseChannel,ikflag, BONE_IK_NO_YDOF), KX_PYATTRIBUTE_FLAG_NEGATIVE_RO("ik_dof_z",bPoseChannel,ikflag, BONE_IK_NO_ZDOF), diff --git a/source/gameengine/Converter/BL_ArmatureConstraint.cpp b/source/gameengine/Converter/BL_ArmatureConstraint.cpp index 0b7ab043d16..ed29cfedd54 100644 --- a/source/gameengine/Converter/BL_ArmatureConstraint.cpp +++ b/source/gameengine/Converter/BL_ArmatureConstraint.cpp @@ -267,8 +267,8 @@ PyAttributeDef BL_ArmatureConstraint::Attributes[] = { KX_PYATTRIBUTE_RO_FUNCTION("name",BL_ArmatureConstraint,py_attr_getattr), KX_PYATTRIBUTE_RW_FUNCTION("enforce",BL_ArmatureConstraint,py_attr_getattr,py_attr_setattr), KX_PYATTRIBUTE_RW_FUNCTION("headtail",BL_ArmatureConstraint,py_attr_getattr,py_attr_setattr), - KX_PYATTRIBUTE_RO_FUNCTION("lin_error",BL_ArmatureConstraint,py_attr_getattr), - KX_PYATTRIBUTE_RO_FUNCTION("rot_error",BL_ArmatureConstraint,py_attr_getattr), + KX_PYATTRIBUTE_RO_FUNCTION("error_location",BL_ArmatureConstraint,py_attr_getattr), + KX_PYATTRIBUTE_RO_FUNCTION("error_rotation",BL_ArmatureConstraint,py_attr_getattr), KX_PYATTRIBUTE_RW_FUNCTION("target",BL_ArmatureConstraint,py_attr_getattr,py_attr_setattr), KX_PYATTRIBUTE_RW_FUNCTION("subtarget",BL_ArmatureConstraint,py_attr_getattr,py_attr_setattr), KX_PYATTRIBUTE_RW_FUNCTION("active",BL_ArmatureConstraint,py_attr_getattr,py_attr_setattr), -- cgit v1.2.3