diff options
| -rw-r--r-- | release/scripts/ui/properties_data_bone.py | 6 | ||||
| -rw-r--r-- | release/scripts/ui/properties_data_lattice.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/properties_data_mesh.py | 4 | ||||
| -rw-r--r-- | release/scripts/ui/properties_data_modifier.py | 36 | ||||
| -rw-r--r-- | release/scripts/ui/properties_material.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/properties_object.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/properties_object_constraint.py | 8 | ||||
| -rw-r--r-- | release/scripts/ui/properties_particle.py | 24 | ||||
| -rw-r--r-- | release/scripts/ui/properties_physics_cloth.py | 8 | ||||
| -rw-r--r-- | release/scripts/ui/properties_physics_smoke.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/properties_physics_softbody.py | 6 | ||||
| -rw-r--r-- | release/scripts/ui/properties_texture.py | 4 | ||||
| -rw-r--r-- | release/scripts/ui/space_image.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/space_outliner.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/space_time.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/space_userpref_keymap.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/space_view3d.py | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_ui_api.c | 2 |
18 files changed, 58 insertions, 58 deletions
diff --git a/release/scripts/ui/properties_data_bone.py b/release/scripts/ui/properties_data_bone.py index 663d576a9c0..086a55aec4f 100644 --- a/release/scripts/ui/properties_data_bone.py +++ b/release/scripts/ui/properties_data_bone.py @@ -151,14 +151,14 @@ class BONE_PT_relations(BoneButtonsPanel, bpy.types.Panel): if ob and pchan: col.label(text="Bone Group:") - col.prop_object(pchan, "bone_group", ob.pose, "bone_groups", text="") + col.prop_search(pchan, "bone_group", ob.pose, "bone_groups", text="") col = split.column() col.label(text="Parent:") if context.bone: col.prop(bone, "parent", text="") else: - col.prop_object(bone, "parent", arm, "edit_bones", text="") + col.prop_search(bone, "parent", arm, "edit_bones", text="") sub = col.column() sub.active = (bone.parent is not None) @@ -202,7 +202,7 @@ class BONE_PT_display(BoneButtonsPanel, bpy.types.Panel): col.label(text="Custom Shape:") col.prop(pchan, "custom_shape", text="") if pchan.custom_shape: - col.prop_object(pchan, "custom_shape_transform", ob.pose, "bones", text="At") + col.prop_search(pchan, "custom_shape_transform", ob.pose, "bones", text="At") class BONE_PT_inverse_kinematics(BoneButtonsPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_data_lattice.py b/release/scripts/ui/properties_data_lattice.py index 9abdb23ea23..c01aa034413 100644 --- a/release/scripts/ui/properties_data_lattice.py +++ b/release/scripts/ui/properties_data_lattice.py @@ -79,7 +79,7 @@ class DATA_PT_lattice(DataButtonsPanel, bpy.types.Panel): row = layout.row() row.prop(lat, "use_outside") - row.prop_object(lat, "vertex_group", context.object, "vertex_groups", text="") + row.prop_search(lat, "vertex_group", context.object, "vertex_groups", text="") class DATA_PT_custom_props_lattice(DataButtonsPanel, PropertyPanel, bpy.types.Panel): diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/ui/properties_data_mesh.py index aaf70692681..fd184819143 100644 --- a/release/scripts/ui/properties_data_mesh.py +++ b/release/scripts/ui/properties_data_mesh.py @@ -245,8 +245,8 @@ class DATA_PT_shape_keys(MeshButtonsPanel, bpy.types.Panel): col = split.column(align=True) col.active = enable_edit_value col.label(text="Blend:") - col.prop_object(kb, "vertex_group", ob, "vertex_groups", text="") - col.prop_object(kb, "relative_key", key, "keys", text="") + col.prop_search(kb, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(kb, "relative_key", key, "keys", text="") else: row = layout.row() diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py index 46ac5ae570f..8950a017022 100644 --- a/release/scripts/ui/properties_data_modifier.py +++ b/release/scripts/ui/properties_data_modifier.py @@ -55,7 +55,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Vertex Group::") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") sub = col.column() sub.active = bool(md.vertex_group) sub.prop(md, "invert_vertex_group") @@ -182,7 +182,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Vertex Group:") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") col = split.column() col.label(text="Control Object:") col.prop(md, "object", text="") @@ -203,7 +203,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "object", text="") col = split.column() col.label(text="Vertex Group:") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") layout.label(text="Deformation Axis:") layout.row().prop(md, "deform_axis", expand=True) @@ -218,7 +218,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.label(text="Texture:") col.prop(md, "texture", text="") col.label(text="Vertex Group:") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") col = split.column() col.label(text="Direction:") @@ -228,7 +228,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): if md.texture_coords == 'OBJECT': layout.prop(md, "texture_coordinate_object", text="Object") elif md.texture_coords == 'UV' and ob.type == 'MESH': - layout.prop_object(md, "uv_layer", ob.data, "uv_textures") + layout.prop_search(md, "uv_layer", ob.data, "uv_textures") layout.separator() @@ -257,7 +257,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Vertex group:") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") sub = col.column() sub.active = bool(md.vertex_group) sub.prop(md, "protect") @@ -282,10 +282,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "object", text="") if md.object and md.object.type == 'ARMATURE': col.label(text="Bone:") - col.prop_object(md, "subtarget", md.object.data, "bones", text="") + col.prop_search(md, "subtarget", md.object.data, "bones", text="") col = split.column() col.label(text="Vertex Group:") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") layout.separator() @@ -314,7 +314,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Vertex Group:") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") def MASK(self, layout, ob, md): split = layout.split() @@ -328,7 +328,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "armature", text="") elif md.mode == 'VERTEX_GROUP': col.label(text="Vertex Group:") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") sub = col.column() sub.active = bool(md.vertex_group) @@ -343,7 +343,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): sub.active = not md.is_bound col = split.column() col.label(text="Vertex Group:") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") sub = col.column() sub.active = bool(md.vertex_group) @@ -480,7 +480,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "target", text="") col = split.column() col.label(text="Vertex Group:") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") split = layout.split() @@ -528,7 +528,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Vertex Group:") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") split = layout.split() @@ -563,7 +563,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col.prop(md, "factor") col.prop(md, "iterations") col.label(text="Vertex Group:") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") def SOFT_BODY(self, layout, ob, md): layout.label(text="See Soft Body panel.") @@ -574,7 +574,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.prop(md, "thickness") - col.prop_object(md, "vertex_group", ob, "vertex_groups", text="") + col.prop_search(md, "vertex_group", ob, "vertex_groups", text="") col.label(text="Crease:") col.prop(md, "edge_crease_inner", text="Inner") @@ -623,7 +623,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="UV Layer:") - col.prop_object(md, "uv_layer", ob.data, "uv_textures", text="") + col.prop_search(md, "uv_layer", ob.data, "uv_textures", text="") split = layout.split() col = split.column() @@ -677,11 +677,11 @@ class DATA_PT_modifiers(ModifierButtonsPanel, bpy.types.Panel): layout.separator() layout.prop(md, "start_position_object") - layout.prop_object(md, "vertex_group", ob, "vertex_groups") + layout.prop_search(md, "vertex_group", ob, "vertex_groups") layout.prop(md, "texture") layout.prop(md, "texture_coords") if md.texture_coords == 'MAP_UV' and ob.type == 'MESH': - layout.prop_object(md, "uv_layer", ob.data, "uv_textures") + layout.prop_search(md, "uv_layer", ob.data, "uv_textures") elif md.texture_coords == 'OBJECT': layout.prop(md, "texture_coords_object") diff --git a/release/scripts/ui/properties_material.py b/release/scripts/ui/properties_material.py index 265f7e08d3a..e5f53d9ed0d 100644 --- a/release/scripts/ui/properties_material.py +++ b/release/scripts/ui/properties_material.py @@ -615,7 +615,7 @@ class MATERIAL_PT_strand(MaterialButtonsPanel, bpy.types.Panel): col.prop(tan, "width_fade") ob = context.object if ob and ob.type == 'MESH': - col.prop_object(tan, "uv_layer", ob.data, "uv_textures", text="") + col.prop_search(tan, "uv_layer", ob.data, "uv_textures", text="") else: col.prop(tan, "uv_layer", text="") col.separator() diff --git a/release/scripts/ui/properties_object.py b/release/scripts/ui/properties_object.py index a87a43a7998..c0d37c16519 100644 --- a/release/scripts/ui/properties_object.py +++ b/release/scripts/ui/properties_object.py @@ -119,7 +119,7 @@ class OBJECT_PT_relations(ObjectButtonsPanel, bpy.types.Panel): sub.prop(ob, "parent_type", text="") parent = ob.parent if parent and ob.parent_type == 'BONE' and parent.type == 'ARMATURE': - sub.prop_object(ob, "parent_bone", parent.data, "bones", text="") + sub.prop_search(ob, "parent_bone", parent.data, "bones", text="") sub.active = (parent is not None) diff --git a/release/scripts/ui/properties_object_constraint.py b/release/scripts/ui/properties_object_constraint.py index 8a8142a790f..a2350155ed5 100644 --- a/release/scripts/ui/properties_object_constraint.py +++ b/release/scripts/ui/properties_object_constraint.py @@ -59,21 +59,21 @@ class ConstraintButtonsPanel(): if con.target and subtargets: if con.target.type == 'ARMATURE': - layout.prop_object(con, "subtarget", con.target.data, "bones", text="Bone") + layout.prop_search(con, "subtarget", con.target.data, "bones", text="Bone") if con.type in ('COPY_LOCATION', 'STRETCH_TO', 'TRACK_TO', 'PIVOT'): row = layout.row() row.label(text="Head/Tail:") row.prop(con, "head_tail", text="") elif con.target.type in ('MESH', 'LATTICE'): - layout.prop_object(con, "subtarget", con.target, "vertex_groups", text="Vertex Group") + layout.prop_search(con, "subtarget", con.target, "vertex_groups", text="Vertex Group") def ik_template(self, layout, con): # only used for iTaSC layout.prop(con, "pole_target") if con.pole_target and con.pole_target.type == 'ARMATURE': - layout.prop_object(con, "pole_subtarget", con.pole_target.data, "bones", text="Bone") + layout.prop_search(con, "pole_subtarget", con.pole_target.data, "bones", text="Bone") if con.pole_target: row = layout.row() @@ -147,7 +147,7 @@ class ConstraintButtonsPanel(): layout.prop(con, "pole_target") if con.pole_target and con.pole_target.type == 'ARMATURE': - layout.prop_object(con, "pole_subtarget", con.pole_target.data, "bones", text="Bone") + layout.prop_search(con, "pole_subtarget", con.pole_target.data, "bones", text="Bone") if con.pole_target: row = layout.row() diff --git a/release/scripts/ui/properties_particle.py b/release/scripts/ui/properties_particle.py index 27d02ac97cd..86072803cfc 100644 --- a/release/scripts/ui/properties_particle.py +++ b/release/scripts/ui/properties_particle.py @@ -1025,51 +1025,51 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, bpy.types.Panel): row = layout.row() - row.prop_object(psys, "vertex_group_density", ob, "vertex_groups", text="Density") + row.prop_search(psys, "vertex_group_density", ob, "vertex_groups", text="Density") row.prop(psys, "invert_vertex_group_density", text="") row = layout.row() - row.prop_object(psys, "vertex_group_velocity", ob, "vertex_groups", text="Velocity") + row.prop_search(psys, "vertex_group_velocity", ob, "vertex_groups", text="Velocity") row.prop(psys, "invert_vertex_group_velocity", text="") row = layout.row() - row.prop_object(psys, "vertex_group_length", ob, "vertex_groups", text="Length") + row.prop_search(psys, "vertex_group_length", ob, "vertex_groups", text="Length") row.prop(psys, "invert_vertex_group_length", text="") row = layout.row() - row.prop_object(psys, "vertex_group_clump", ob, "vertex_groups", text="Clump") + row.prop_search(psys, "vertex_group_clump", ob, "vertex_groups", text="Clump") row.prop(psys, "invert_vertex_group_clump", text="") row = layout.row() - row.prop_object(psys, "vertex_group_kink", ob, "vertex_groups", text="Kink") + row.prop_search(psys, "vertex_group_kink", ob, "vertex_groups", text="Kink") row.prop(psys, "invert_vertex_group_kink", text="") row = layout.row() - row.prop_object(psys, "vertex_group_roughness_1", ob, "vertex_groups", text="Roughness 1") + row.prop_search(psys, "vertex_group_roughness_1", ob, "vertex_groups", text="Roughness 1") row.prop(psys, "invert_vertex_group_roughness_1", text="") row = layout.row() - row.prop_object(psys, "vertex_group_roughness_2", ob, "vertex_groups", text="Roughness 2") + row.prop_search(psys, "vertex_group_roughness_2", ob, "vertex_groups", text="Roughness 2") row.prop(psys, "invert_vertex_group_roughness_2", text="") row = layout.row() - row.prop_object(psys, "vertex_group_roughness_end", ob, "vertex_groups", text="Roughness End") + row.prop_search(psys, "vertex_group_roughness_end", ob, "vertex_groups", text="Roughness End") row.prop(psys, "invert_vertex_group_roughness_end", text="") row = layout.row() - row.prop_object(psys, "vertex_group_size", ob, "vertex_groups", text="Size") + row.prop_search(psys, "vertex_group_size", ob, "vertex_groups", text="Size") row.prop(psys, "invert_vertex_group_size", text="") row = layout.row() - row.prop_object(psys, "vertex_group_tangent", ob, "vertex_groups", text="Tangent") + row.prop_search(psys, "vertex_group_tangent", ob, "vertex_groups", text="Tangent") row.prop(psys, "invert_vertex_group_tangent", text="") row = layout.row() - row.prop_object(psys, "vertex_group_rotation", ob, "vertex_groups", text="Rotation") + row.prop_search(psys, "vertex_group_rotation", ob, "vertex_groups", text="Rotation") row.prop(psys, "invert_vertex_group_rotation", text="") row = layout.row() - row.prop_object(psys, "vertex_group_field", ob, "vertex_groups", text="Field") + row.prop_search(psys, "vertex_group_field", ob, "vertex_groups", text="Field") row.prop(psys, "invert_vertex_group_field", text="") diff --git a/release/scripts/ui/properties_physics_cloth.py b/release/scripts/ui/properties_physics_cloth.py index 30619de5814..7936b5e04ee 100644 --- a/release/scripts/ui/properties_physics_cloth.py +++ b/release/scripts/ui/properties_physics_cloth.py @@ -105,7 +105,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, bpy.types.Panel): col.prop(cloth, "use_pin_cloth", text="Pinning") sub = col.column() sub.active = cloth.use_pin_cloth - sub.prop_object(cloth, "mass_vertex_group", ob, "vertex_groups", text="") + sub.prop_search(cloth, "mass_vertex_group", ob, "vertex_groups", text="") sub.prop(cloth, "pin_stiffness", text="Stiffness") col.label(text="Pre roll:") @@ -126,7 +126,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, bpy.types.Panel): if key: col.label(text="Rest Shape Key:") - col.prop_object(cloth, "rest_shape_key", key, "keys", text="") + col.prop_search(cloth, "rest_shape_key", key, "keys", text="") class PHYSICS_PT_cloth_cache(PhysicButtonsPanel, bpy.types.Panel): @@ -208,12 +208,12 @@ class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.label(text="Structural Stiffness:") - col.prop_object(cloth, "structural_stiffness_vertex_group", ob, "vertex_groups", text="") + col.prop_search(cloth, "structural_stiffness_vertex_group", ob, "vertex_groups", text="") col.prop(cloth, "structural_stiffness_max", text="Max") col = split.column() col.label(text="Bending Stiffness:") - col.prop_object(cloth, "bending_vertex_group", ob, "vertex_groups", text="") + col.prop_search(cloth, "bending_vertex_group", ob, "vertex_groups", text="") col.prop(cloth, "bending_stiffness_max", text="Max") diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py index d2e37ef29fb..41658daf808 100644 --- a/release/scripts/ui/properties_physics_smoke.py +++ b/release/scripts/ui/properties_physics_smoke.py @@ -97,7 +97,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, bpy.types.Panel): col = split.column() col.prop(flow, "use_outflow") col.label(text="Particle System:") - col.prop_object(flow, "psys", ob, "particle_systems", text="") + col.prop_search(flow, "psys", ob, "particle_systems", text="") sub = col.column() sub.active = not md.flow_settings.outflow diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py index 3722182caa1..0403e256bdf 100644 --- a/release/scripts/ui/properties_physics_softbody.py +++ b/release/scripts/ui/properties_physics_softbody.py @@ -77,7 +77,7 @@ class PHYSICS_PT_softbody(PhysicButtonsPanel, bpy.types.Panel): col.label(text="Object:") col.prop(softbody, "friction") col.prop(softbody, "mass") - col.prop_object(softbody, "mass_vertex_group", ob, "vertex_groups", text="Mass:") + col.prop_search(softbody, "mass_vertex_group", ob, "vertex_groups", text="Mass:") col = split.column() col.label(text="Simulation:") @@ -137,7 +137,7 @@ class PHYSICS_PT_softbody_goal(PhysicButtonsPanel, bpy.types.Panel): col.prop(softbody, "goal_spring", text="Stiffness") col.prop(softbody, "goal_friction", text="Damping") - layout.prop_object(softbody, "goal_vertex_group", ob, "vertex_groups", text="Vertex Group") + layout.prop_search(softbody, "goal_vertex_group", ob, "vertex_groups", text="Vertex Group") class PHYSICS_PT_softbody_edge(PhysicButtonsPanel, bpy.types.Panel): @@ -173,7 +173,7 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel, bpy.types.Panel): col.prop(softbody, "plastic") col.prop(softbody, "bend") col.prop(softbody, "spring_length", text="Length") - col.prop_object(softbody, "spring_vertex_group", ob, "vertex_groups", text="Springs:") + col.prop_search(softbody, "spring_vertex_group", ob, "vertex_groups", text="Springs:") col = split.column() col.prop(softbody, "use_stiff_quads") diff --git a/release/scripts/ui/properties_texture.py b/release/scripts/ui/properties_texture.py index 5163ae884ed..be523f735d8 100644 --- a/release/scripts/ui/properties_texture.py +++ b/release/scripts/ui/properties_texture.py @@ -243,7 +243,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, bpy.types.Panel): split.label(text="Layer:") ob = context.object if ob and ob.type == 'MESH': - split.prop_object(tex, "uv_layer", ob.data, "uv_textures", text="") + split.prop_search(tex, "uv_layer", ob.data, "uv_textures", text="") else: split.prop(tex, "uv_layer", text="") @@ -904,7 +904,7 @@ class TEXTURE_PT_pointdensity(TextureButtonsPanel, bpy.types.Panel): sub.enabled = bool(pd.object) if pd.object: sub.label(text="System:") - sub.prop_object(pd, "particle_system", pd.object, "particle_systems", text="") + sub.prop_search(pd, "particle_system", pd.object, "particle_systems", text="") sub.label(text="Cache:") sub.prop(pd, "particle_cache_space", text="") else: diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index 11324b59b3b..fc21292bc5e 100644 --- a/release/scripts/ui/space_image.py +++ b/release/scripts/ui/space_image.py @@ -316,7 +316,7 @@ class IMAGE_HT_header(bpy.types.Header): row.prop(toolsettings, "snap_element", text="", icon_only=True) # mesh = context.edit_object.data - # row.prop_object(mesh, "active_uv_layer", mesh, "uv_textures") + # row.prop_search(mesh, "active_uv_layer", mesh, "uv_textures") if ima: # layers diff --git a/release/scripts/ui/space_outliner.py b/release/scripts/ui/space_outliner.py index e170dc0322c..e2d8db385f6 100644 --- a/release/scripts/ui/space_outliner.py +++ b/release/scripts/ui/space_outliner.py @@ -53,7 +53,7 @@ class OUTLINER_HT_header(bpy.types.Header): if ks: row = layout.row(align=False) - row.prop_object(scene, "active_keying_set", scene, "keying_sets", text="") + row.prop_search(scene, "active_keying_set", scene, "keying_sets", text="") row = layout.row(align=True) row.operator("anim.keyframe_insert", text="", icon='KEY_HLT') diff --git a/release/scripts/ui/space_time.py b/release/scripts/ui/space_time.py index cfd8401b46b..7745207341a 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, "keying_sets_all", text="") + row.prop_search(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_userpref_keymap.py b/release/scripts/ui/space_userpref_keymap.py index f966f8a7e8b..b725ba5139c 100644 --- a/release/scripts/ui/space_userpref_keymap.py +++ b/release/scripts/ui/space_userpref_keymap.py @@ -364,7 +364,7 @@ class InputKeyMapPanel(bpy.types.Panel): subcol = subsplit.column() row = subcol.row() - row.prop_object(wm, "active_keyconfig", wm, "keyconfigs", text="Key Config:") + row.prop_search(wm, "active_keyconfig", wm, "keyconfigs", text="Key Config:") layout.set_context_pointer("keyconfig", wm.active_keyconfig) row.operator("wm.keyconfig_remove", text="", icon='X') diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index b8b220cad0c..3623fc9d591 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -1957,7 +1957,7 @@ class VIEW3D_PT_view3d_properties(bpy.types.Panel): col.label(text="Lock to Object:") col.prop(view, "lock_object", text="") if view.lock_object and view.lock_object.type == 'ARMATURE': - col.prop_object(view, "lock_bone", view.lock_object.data, "bones", text="") + col.prop_search(view, "lock_bone", view.lock_object.data, "bones", text="") col = layout.column(align=True) col.label(text="Clip:") diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c index 720666a6180..eef9e89f8df 100644 --- a/source/blender/makesrna/intern/rna_ui_api.c +++ b/source/blender/makesrna/intern/rna_ui_api.c @@ -182,7 +182,7 @@ void RNA_api_ui_layout(StructRNA *srna) RNA_def_property_flag(parm, PROP_REQUIRED); api_ui_item_common(func); - func= RNA_def_function(srna, "prop_object", "uiItemPointerR"); + func= RNA_def_function(srna, "prop_search", "uiItemPointerR"); api_ui_item_rna_common(func); parm= RNA_def_pointer(func, "search_data", "AnyType", "", "Data from which to take collection to search in."); RNA_def_property_flag(parm, PROP_REQUIRED|PROP_RNAPTR|PROP_NEVER_NULL); |