diff options
46 files changed, 209 insertions, 250 deletions
diff --git a/release/scripts/io/import_anim_bvh.py b/release/scripts/io/import_anim_bvh.py index d497ac47065..89097fd53f5 100644 --- a/release/scripts/io/import_anim_bvh.py +++ b/release/scripts/io/import_anim_bvh.py @@ -347,7 +347,7 @@ def bvh_node_dict2armature(context, bvh_nodes, ROT_MODE='XYZ', IMPORT_START_FRAM scn = context.scene #XXX scn.objects.selected = [] for ob in scn.objects: - ob.selected = False + ob.select = False scn.set_frame(IMPORT_START_FRAME) @@ -356,7 +356,7 @@ def bvh_node_dict2armature(context, bvh_nodes, ROT_MODE='XYZ', IMPORT_START_FRAM scn.objects.link(arm_ob) - arm_ob.selected = True + arm_ob.select = True scn.objects.active = arm_ob print(scn.objects.active) diff --git a/release/scripts/modules/add_object_utils.py b/release/scripts/modules/add_object_utils.py index cef368c529d..9031121060a 100644 --- a/release/scripts/modules/add_object_utils.py +++ b/release/scripts/modules/add_object_utils.py @@ -50,12 +50,12 @@ def add_object_data(context, obdata, operator=None): # ugh, could be made nicer for ob in scene.objects: - ob.selected = False + ob.select = False obj_new = bpy.data.objects.new(obdata.name, obdata) base = scene.objects.link(obj_new) - base.selected = True + base.select = True if context.space_data and context.space_data.type == 'VIEW_3D': base.layers_from_view(context.space_data) @@ -68,7 +68,7 @@ def add_object_data(context, obdata, operator=None): if obj_act and obj_act.mode == 'EDIT' and obj_act.type == obj_new.type: bpy.ops.object.mode_set(mode='OBJECT') - obj_act.selected = True + obj_act.select = True scene.update() # apply location #scene.objects.active = obj_new diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 9d6f5ce7b2f..8cbb2bf4e80 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -444,7 +444,7 @@ class Mesh(bpy_types.ID): if not hasattr(edges, "pop"): edges = edges[:] - edge_dict = {ed.key: ed for ed in self.edges if ed.selected} + edge_dict = {ed.key: ed for ed in self.edges if ed.select} while edges: current_edge = edges.pop() diff --git a/release/scripts/modules/rigify/__init__.py b/release/scripts/modules/rigify/__init__.py index ef8f62ad058..095229016e9 100644 --- a/release/scripts/modules/rigify/__init__.py +++ b/release/scripts/modules/rigify/__init__.py @@ -191,8 +191,8 @@ def generate_rig(context, obj_orig, prefix="ORG-", META_DEF=True): obj.animation_data_clear() # Select generated rig object - obj_orig.selected = False - obj.selected = True + obj_orig.select = False + obj.select = True scene.objects.active = obj # Remove all bones from the generated rig armature. @@ -212,9 +212,9 @@ def generate_rig(context, obj_orig, prefix="ORG-", META_DEF=True): # Select the temp rigs for merging for objt in scene.objects: - objt.selected = False # deselect all objects - temp_rig_1.selected = True - temp_rig_2.selected = True + objt.select = False # deselect all objects + temp_rig_1.select = True + temp_rig_2.select = True scene.objects.active = temp_rig_2 # Merge the temporary rigs @@ -225,8 +225,8 @@ def generate_rig(context, obj_orig, prefix="ORG-", META_DEF=True): # Select the generated rig for objt in scene.objects: - objt.selected = False # deselect all objects - obj.selected = True + objt.select = False # deselect all objects + obj.select = True scene.objects.active = obj # Copy over the pose_bone properties @@ -464,7 +464,7 @@ def generate_rig(context, obj_orig, prefix="ORG-", META_DEF=True): arm.layer = layer_show - # obj.restrict_view = True + # obj.hide = True obj.data.draw_axes = False bpy.ops.object.mode_set(mode=mode_orig) @@ -490,8 +490,8 @@ def generate_test(context, metarig_type="", GENERATE_FINAL=True): scene.objects.link(obj_new) scene.objects.active = obj_new for obj in scene.objects: - obj.selected = False - obj_new.selected = True + obj.select = False + obj_new.select = True for module_name in get_submodule_types(): if (metarig_type and module_name != metarig_type): @@ -551,8 +551,8 @@ def generate_test_all(context, GRAPH=False): obj.data.drawtype = 'STICK' obj.location[1] += i obj_new.location[1] += i - obj_new.selected = False - obj.selected = True + obj_new.select = False + obj.select = True i += 4 diff --git a/release/scripts/modules/rigify/arm_biped.py b/release/scripts/modules/rigify/arm_biped.py index 7a99eb5d80a..f80a617df47 100644 --- a/release/scripts/modules/rigify/arm_biped.py +++ b/release/scripts/modules/rigify/arm_biped.py @@ -137,8 +137,8 @@ def ik(obj, definitions, base_names, options): ik.pole_vis = add_stretch_to(obj, mt.forearm, ik.pole, "VIS-%s_ik" % base_names[mt.forearm]) ik.update() - ik.hand_vis_e.restrict_select = True - ik.pole_vis_e.restrict_select = True + ik.hand_vis_e.hide_select = True + ik.pole_vis_e.hide_select = True bpy.ops.object.mode_set(mode='OBJECT') diff --git a/release/scripts/op/fcurve_euler_filter.py b/release/scripts/op/fcurve_euler_filter.py index bba4576ef73..39c226294ee 100644 --- a/release/scripts/op/fcurve_euler_filter.py +++ b/release/scripts/op/fcurve_euler_filter.py @@ -40,7 +40,7 @@ def main(context): flist = bpy.context.active_object.animation_data.action.fcurves for f in flist: - if f.selected and f.data_path.endswith("rotation_euler"): + if f.select and f.data_path.endswith("rotation_euler"): cleanupEulCurve(f) class DiscontFilterOp(bpy.types.Operator): diff --git a/release/scripts/op/mesh.py b/release/scripts/op/mesh.py index 78ca9a18cdc..b63997b8eba 100644 --- a/release/scripts/op/mesh.py +++ b/release/scripts/op/mesh.py @@ -54,9 +54,9 @@ class MeshSelectInteriorFaces(bpy.types.Operator): for index, face in enumerate(face_list): if(test_interior(index)): - face.selected = True + face.select = True else: - face.selected = False + face.select = False if is_editmode: bpy.ops.object.mode_set(mode='EDIT', toggle=False) @@ -122,7 +122,7 @@ class MeshMirrorUV(bpy.types.Operator): # as a list faces = mesh.faces[:] - fuvsel = [(False not in uv.uv_selected) for uv in active_uv_layer] + fuvsel = [(False not in uv.select_uv) for uv in active_uv_layer] fcents = [f.center for f in faces] # find mirror faces diff --git a/release/scripts/op/nla.py b/release/scripts/op/nla.py index d0c53758ba9..ceb4621d643 100644 --- a/release/scripts/op/nla.py +++ b/release/scripts/op/nla.py @@ -100,7 +100,7 @@ def bake(frame_start, frame_end, step=1, only_selected=False): pose_items = pose.bones.items() for name, pbone in pose_items: - if only_selected and not pbone.selected: + if only_selected and not pbone.select: continue for f in frame_range: diff --git a/release/scripts/op/object.py b/release/scripts/op/object.py index b16d2b0dcf2..2df1250251e 100644 --- a/release/scripts/op/object.py +++ b/release/scripts/op/object.py @@ -52,9 +52,9 @@ class SelectPattern(bpy.types.Operator): # Can be pose bones or objects for item in items: if pattern_match(item.name, self.properties.pattern): - item.selected = True + item.select = True elif not self.properties.extend: - item.selected = False + item.select = False return {'FINISHED'} @@ -90,7 +90,7 @@ class SelectCamera(bpy.types.Operator): self.report({'WARNING'}, "Active camera is not in this scene") context.scene.objects.active = camera - camera.selected = True + camera.select = True return {'FINISHED'} @@ -121,7 +121,7 @@ class SelectHierarchy(bpy.types.Operator): if not self.properties.extend: # for obj in objs: - # obj.selected = False + # obj.select = False bpy.ops.object.select_all(action='DESELECT') if self.properties.direction == 'PARENT': @@ -135,7 +135,7 @@ class SelectHierarchy(bpy.types.Operator): if obj_act == obj: context.scene.objects.active = parent - parent.selected = True + parent.select = True if parents: return {'CANCELLED'} @@ -145,7 +145,7 @@ class SelectHierarchy(bpy.types.Operator): for obj in objs: children += list(obj.children) for obj_iter in children: - obj_iter.selected = True + obj_iter.select = True children.sort(key=lambda obj_iter: obj_iter.name) context.scene.objects.active = children[0] @@ -536,11 +536,11 @@ class IsolateTypeRender(bpy.types.Operator): for obj in context.visible_objects: - if obj.selected: - obj.restrict_render = False + if obj.select: + obj.hide_render = False else: if obj.type == act_type: - obj.restrict_render = True + obj.hide_render = True return {'FINISHED'} diff --git a/release/scripts/op/sequencer.py b/release/scripts/op/sequencer.py index 13668498aae..cf876189907 100644 --- a/release/scripts/op/sequencer.py +++ b/release/scripts/op/sequencer.py @@ -40,7 +40,7 @@ class SequencerCrossfadeSounds(bpy.types.Operator): seq1 = None seq2 = None for s in context.scene.sequence_editor.sequences: - if s.selected and s.type == 'SOUND': + if s.select and s.type == 'SOUND': if seq1 == None: seq1 = s elif seq2 == None: @@ -97,13 +97,13 @@ class SequencerCutMulticam(bpy.types.Operator): if s.multicam_source == camera: return {'FINISHED'} - if not s.selected: - s.selected = True + if not s.select: + s.select = True cfra = context.scene.frame_current bpy.ops.sequencer.cut(frame=cfra, type='SOFT', side='RIGHT') for s in context.scene.sequence_editor.sequences_all: - if s.selected and s.type == 'MULTICAM' and s.frame_final_start <= cfra and cfra < s.frame_final_end: + if s.select and s.type == 'MULTICAM' and s.frame_final_start <= cfra and cfra < s.frame_final_end: context.scene.sequence_editor.active_strip = s context.scene.sequence_editor.active_strip.multicam_source = camera @@ -125,7 +125,7 @@ class SequencerDeinterlaceSelectedMovies(bpy.types.Operator): def execute(self, context): for s in context.scene.sequence_editor.sequences_all: - if s.selected and s.type == 'MOVIE': + if s.select and s.type == 'MOVIE': s.de_interlace = True return {'FINISHED'} diff --git a/release/scripts/op/uv.py b/release/scripts/op/uv.py index 51c1695677b..a7abd475b8d 100644 --- a/release/scripts/op/uv.py +++ b/release/scripts/op/uv.py @@ -85,9 +85,9 @@ class ExportUVLayout(bpy.types.Operator): for i in range(uv_layer_len): uv_elem = uv_layer[i] # context checks - if faces[i].selected and (local_image is Ellipsis or local_image == uv_elem.image): + if faces[i].select and (local_image is Ellipsis or local_image == uv_elem.image): #~ uv = uv_elem.uv - #~ if False not in uv_elem.uv_selected[:len(uv)]: + #~ if False not in uv_elem.select_uv[:len(uv)]: #~ yield (i, uv) # just write what we see. diff --git a/release/scripts/op/uvcalc_follow_active.py b/release/scripts/op/uvcalc_follow_active.py index 61c149c8735..6466d48a9fe 100644 --- a/release/scripts/op/uvcalc_follow_active.py +++ b/release/scripts/op/uvcalc_follow_active.py @@ -146,7 +146,7 @@ def extend(obj, operator, EXTEND_MODE): operator.report({'ERROR'}, "No active face.") return - face_sel = [f for f in me.faces if len(f.verts) == 4 and f.selected] + face_sel = [f for f in me.faces if len(f.verts) == 4 and f.select] face_act_local_index = -1 for i, f in enumerate(face_sel): diff --git a/release/scripts/op/uvcalc_smart_project.py b/release/scripts/op/uvcalc_smart_project.py index 13bf6244f4d..a7ef980e8c5 100644 --- a/release/scripts/op/uvcalc_smart_project.py +++ b/release/scripts/op/uvcalc_smart_project.py @@ -821,7 +821,7 @@ def main(context, island_margin, projection_limit): #XXX ob = objects.active ob= objects[0] - if ob and ob.selected == 0 and ob.type == 'MESH': + if ob and (not ob.select) and ob.type == 'MESH': # Add to the list obList =[ob] del objects @@ -899,7 +899,7 @@ def main(context, island_margin, projection_limit): me_verts = list(me.verts) if USER_ONLY_SELECTED_FACES: - meshFaces = [thickface(f, uv_layer[i], me_verts) for i, f in enumerate(me.faces) if f.selected] + meshFaces = [thickface(f, uv_layer[i], me_verts) for i, f in enumerate(me.faces) if f.select] #else: # meshFaces = map(thickface, me.faces) diff --git a/release/scripts/op/vertexpaint_dirt.py b/release/scripts/op/vertexpaint_dirt.py index c1521866a56..63a3aa3896b 100644 --- a/release/scripts/op/vertexpaint_dirt.py +++ b/release/scripts/op/vertexpaint_dirt.py @@ -127,7 +127,7 @@ def applyVertexDirt(me, blur_iterations, blur_strength, clamp_dirt, clamp_clean, return('CANCELLED', ) for i, f in enumerate(me.faces): - if not me.use_paint_mask or f.selected: + if not me.use_paint_mask or f.select: f_col = active_col_layer[i] diff --git a/release/scripts/presets/interaction/maya.py b/release/scripts/presets/interaction/maya.py index 31652035dff..777dee1e563 100644 --- a/release/scripts/presets/interaction/maya.py +++ b/release/scripts/presets/interaction/maya.py @@ -244,9 +244,9 @@ kmi = km.items.add('object.location_clear', 'G', 'PRESS', alt=True) kmi = km.items.add('object.rotation_clear', 'R', 'PRESS', alt=True) kmi = km.items.add('object.scale_clear', 'S', 'PRESS', alt=True) kmi = km.items.add('object.origin_clear', 'O', 'PRESS', alt=True) -kmi = km.items.add('object.restrictview_clear', 'H', 'PRESS', alt=True) -kmi = km.items.add('object.restrictview_set', 'H', 'PRESS') -kmi = km.items.add('object.restrictview_set', 'H', 'PRESS', shift=True) +kmi = km.items.add('object.hide_clear', 'H', 'PRESS', alt=True) +kmi = km.items.add('object.hide_set', 'H', 'PRESS') +kmi = km.items.add('object.hide_set', 'H', 'PRESS', shift=True) kmi.properties.unselected = True kmi = km.items.add('object.move_to_layer', 'M', 'PRESS') kmi = km.items.add('object.delete', 'X', 'PRESS') diff --git a/release/scripts/templates/operator_uv.py b/release/scripts/templates/operator_uv.py index 1003bd6c58b..9327de33312 100644 --- a/release/scripts/templates/operator_uv.py +++ b/release/scripts/templates/operator_uv.py @@ -16,7 +16,7 @@ def main(context): for i, uv in enumerate(mesh.active_uv_texture.data): uvs = uv.uv1, uv.uv2, uv.uv3, uv.uv4 for j, v_idx in enumerate(mesh.faces[i].verts): - if uv.uv_selected[j]: + if uv.select_uv[j]: # apply the location of the vertex as a UV uvs[j][:] = mesh.verts[v_idx].co.xy diff --git a/release/scripts/ui/properties_data_bone.py b/release/scripts/ui/properties_data_bone.py index b6b638ef380..a4be7b31042 100644 --- a/release/scripts/ui/properties_data_bone.py +++ b/release/scripts/ui/properties_data_bone.py @@ -81,13 +81,13 @@ class BONE_PT_transform(BoneButtonsPanel): sub.label(text="Roll:") sub.prop(bone, "roll", text="") sub.label() - sub.prop(bone, "locked") + sub.prop(bone, "lock") else: col = layout.column() col.prop(bone, "head") col.prop(bone, "tail") col.prop(bone, "roll") - col.prop(bone, "locked") + col.prop(bone, "lock") else: pchan = ob.pose.bones[context.bone.name] @@ -231,7 +231,7 @@ class BONE_PT_display(BoneButtonsPanel): col = split.column() col.prop(bone, "draw_wire", text="Wireframe") - col.prop(bone, "hidden", text="Hide") + col.prop(bone, "hide", text="Hide") if wide_ui: col = split.column() diff --git a/release/scripts/ui/properties_game.py b/release/scripts/ui/properties_game.py index 9ec7168f834..88803993c92 100644 --- a/release/scripts/ui/properties_game.py +++ b/release/scripts/ui/properties_game.py @@ -58,7 +58,7 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel): col = split.column() col.prop(game, "actor") col.prop(game, "ghost") - col.prop(ob, "restrict_render", text="Invisible") # out of place but useful + col.prop(ob, "hide_render", text="Invisible") # out of place but useful if wide_ui: col = split.column() @@ -120,7 +120,7 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel): col = layout.column() col.prop(game, "actor") col.prop(game, "ghost") - col.prop(ob, "restrict_render", text="Invisible") + col.prop(ob, "hide_render", text="Invisible") layout.separator() @@ -156,10 +156,10 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel): col = layout.column() col.prop(game, "actor") col.prop(game, "ghost") - col.prop(ob, "restrict_render", text="Invisible") + col.prop(ob, "hide_render", text="Invisible") elif game.physics_type in ('SENSOR', 'INVISIBLE', 'NO_COLLISION', 'OCCLUDE'): - layout.prop(ob, "restrict_render", text="Invisible") + layout.prop(ob, "hide_render", text="Invisible") class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel): diff --git a/release/scripts/ui/properties_object_constraint.py b/release/scripts/ui/properties_object_constraint.py index 335bd25b501..edeadb9326b 100644 --- a/release/scripts/ui/properties_object_constraint.py +++ b/release/scripts/ui/properties_object_constraint.py @@ -523,7 +523,7 @@ class ConstraintButtonsPanel(bpy.types.Panel): row = layout.row() if wide_ui: row.label(text="Lock:") - row.prop(con, "locked", expand=True) + row.prop(con, "lock", expand=True) def LIMIT_DISTANCE(self, context, layout, con, wide_ui): self.target_template(layout, con, wide_ui) diff --git a/release/scripts/ui/space_time.py b/release/scripts/ui/space_time.py index 042e4dbc015..8c24dbc2d9c 100644 --- a/release/scripts/ui/space_time.py +++ b/release/scripts/ui/space_time.py @@ -141,7 +141,7 @@ class TIME_MT_frame(bpy.types.Menu): # it was ok for riscos... ok TODO, operator for marker in context.scene.timeline_markers: - if marker.selected: + if marker.select: layout.separator() layout.prop(marker, "name", text="", icon='MARKER_HLT') break diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index bab3695a0b6..3ad945cd19d 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -859,9 +859,9 @@ class VIEW3D_MT_object_showhide(bpy.types.Menu): def draw(self, context): layout = self.layout - layout.operator("object.restrictview_clear", text="Show Hidden") - layout.operator("object.restrictview_set", text="Hide Selected") - layout.operator("object.restrictview_set", text="Hide Unselected").unselected = True + layout.operator("object.hide_view_clear", text="Show Hidden") + layout.operator("object.hide_view_set", text="Hide Selected") + layout.operator("object.hide_view_set", text="Hide Unselected").unselected = True class VIEW3D_MT_make_single_user(bpy.types.Menu): diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index cd6714ec51f..8c6a81bddf4 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -633,7 +633,7 @@ void ANIM_uiTemplate_fmodifier_draw (uiLayout *layout, ID *id, ListBase *modifie /* 'mute' button */ - uiItemR(subrow, &ptr, "muted", UI_ITEM_R_ICON_ONLY, "", 0); + uiItemR(subrow, &ptr, "mute", UI_ITEM_R_ICON_ONLY, "", 0); uiBlockSetEmboss(block, UI_EMBOSSN); diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 186f3f20082..659ee7b9cea 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -4737,7 +4737,7 @@ static int delete_invoke(bContext *C, wmOperator *op, wmEvent *event) void CURVE_OT_delete(wmOperatorType *ot) { static EnumPropertyItem type_items[] = { - {0, "SELECTED", 0, "Selected", ""}, + {0, "SELECTED", 0, "Select", ""}, {1, "SEGMENT", 0, "Segment", ""}, {2, "ALL", 0, "All", ""}, {0, NULL, 0, NULL, NULL}}; diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c index 17bafa3d399..c1ac863b362 100644 --- a/source/blender/editors/gpencil/gpencil_buttons.c +++ b/source/blender/editors/gpencil/gpencil_buttons.c @@ -126,7 +126,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl) /* locked */ icon= (gpl->flag & GP_LAYER_LOCKED) ? ICON_LOCKED : ICON_UNLOCKED; - uiItemR(subrow, &ptr, "locked", 0, "", icon); + uiItemR(subrow, &ptr, "lock", 0, "", icon); /* when layer is locked or hidden, only draw header */ if (gpl->flag & (GP_LAYER_LOCKED|GP_LAYER_HIDE)) { diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index f951def739f..ecbdab98257 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2049,7 +2049,7 @@ void uiTemplateTriColorSet(uiLayout *layout, PointerRNA *ptr, char *propname) csPtr= RNA_property_pointer_get(ptr, prop); uiItemR(row, &csPtr, "normal", 0, "", 0); - uiItemR(row, &csPtr, "selected", 0, "", 0); + uiItemR(row, &csPtr, "select", 0, "", 0); uiItemR(row, &csPtr, "active", 0, "", 0); } diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c index 5fe09f0083e..78f8e0e11d3 100644 --- a/source/blender/editors/object/object_edit.c +++ b/source/blender/editors/object/object_edit.c @@ -135,7 +135,7 @@ Object *ED_object_active_context(bContext *C) /* ********* clear/set restrict view *********/ -static int object_restrictview_clear_exec(bContext *C, wmOperator *op) +static int object_hide_view_clear_exec(bContext *C, wmOperator *op) { ScrArea *sa= CTX_wm_area(C); View3D *v3d= sa->spacedata.first; @@ -160,23 +160,23 @@ static int object_restrictview_clear_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void OBJECT_OT_restrictview_clear(wmOperatorType *ot) +void OBJECT_OT_hide_view_clear(wmOperatorType *ot) { /* identifiers */ ot->name= "Clear Restrict View"; - ot->description = "Reveal the object by setting the restrictview flag"; - ot->idname= "OBJECT_OT_restrictview_clear"; + ot->description = "Reveal the object by setting the hide flag"; + ot->idname= "OBJECT_OT_hide_view_clear"; /* api callbacks */ - ot->exec= object_restrictview_clear_exec; + ot->exec= object_hide_view_clear_exec; ot->poll= ED_operator_view3d_active; /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; } -static int object_restrictview_set_exec(bContext *C, wmOperator *op) +static int object_hide_view_set_exec(bContext *C, wmOperator *op) { Scene *scene= CTX_data_scene(C); short changed = 0; @@ -213,15 +213,15 @@ static int object_restrictview_set_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void OBJECT_OT_restrictview_set(wmOperatorType *ot) +void OBJECT_OT_hide_view_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Restrict View"; - ot->description = "Hide the object by setting the restrictview flag"; - ot->idname= "OBJECT_OT_restrictview_set"; + ot->description = "Hide the object by setting the hide flag"; + ot->idname= "OBJECT_OT_hide_view_set"; /* api callbacks */ - ot->exec= object_restrictview_set_exec; + ot->exec= object_hide_view_set_exec; ot->poll= ED_operator_view3d_active; /* flags */ @@ -232,7 +232,7 @@ void OBJECT_OT_restrictview_set(wmOperatorType *ot) } /* 99% same as above except no need for scene refreshing (TODO, update render preview) */ -static int object_restrictrender_clear_exec(bContext *C, wmOperator *op) +static int object_hide_render_clear_exec(bContext *C, wmOperator *op) { short changed= 0; @@ -251,23 +251,23 @@ static int object_restrictrender_clear_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void OBJECT_OT_restrictrender_clear(wmOperatorType *ot) +void OBJECT_OT_hide_render_clear(wmOperatorType *ot) { /* identifiers */ ot->name= "Clear Restrict Render"; - ot->description = "Reveal the render object by setting the restrictrender flag"; - ot->idname= "OBJECT_OT_restrictrender_clear"; + ot->description = "Reveal the render object by setting the hide render flag"; + ot->idname= "OBJECT_OT_hide_render_clear"; /* api callbacks */ - ot->exec= object_restrictrender_clear_exec; + ot->exec= object_hide_render_clear_exec; ot->poll= ED_operator_view3d_active; /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; } -static int object_restrictrender_set_exec(bContext *C, wmOperator *op) +static int object_hide_render_set_exec(bContext *C, wmOperator *op) { int unselected= RNA_boolean_get(op->ptr, "unselected"); @@ -288,15 +288,15 @@ static int object_restrictrender_set_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void OBJECT_OT_restrictrender_set(wmOperatorType *ot) +void OBJECT_OT_hide_render_set(wmOperatorType *ot) { /* identifiers */ ot->name= "Set Restrict Render"; - ot->description = "Hide the render object by setting the restrictrender flag"; - ot->idname= "OBJECT_OT_restrictrender_set"; + ot->description = "Hide the render object by setting the hide render flag"; + ot->idname= "OBJECT_OT_hide_render_set"; /* api callbacks */ - ot->exec= object_restrictrender_set_exec; + ot->exec= object_hide_render_set_exec; ot->poll= ED_operator_view3d_active; /* flags */ diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 8bd0da3b43f..3c22ccdad8f 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -75,10 +75,10 @@ void OBJECT_OT_drop_named_material(struct wmOperatorType *ot); void OBJECT_OT_mode_set(struct wmOperatorType *ot); void OBJECT_OT_editmode_toggle(struct wmOperatorType *ot); void OBJECT_OT_posemode_toggle(struct wmOperatorType *ot); -void OBJECT_OT_restrictview_set(struct wmOperatorType *ot); -void OBJECT_OT_restrictview_clear(struct wmOperatorType *ot); -void OBJECT_OT_restrictrender_set(struct wmOperatorType *ot); -void OBJECT_OT_restrictrender_clear(struct wmOperatorType *ot); +void OBJECT_OT_hide_view_set(struct wmOperatorType *ot); +void OBJECT_OT_hide_view_clear(struct wmOperatorType *ot); +void OBJECT_OT_hide_render_set(struct wmOperatorType *ot); +void OBJECT_OT_hide_render_clear(struct wmOperatorType *ot); void OBJECT_OT_proxy_make(struct wmOperatorType *ot); void OBJECT_OT_shade_smooth(struct wmOperatorType *ot); void OBJECT_OT_shade_flat(struct wmOperatorType *ot); diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c index ba706a0d4b9..804f4dd7704 100644 --- a/source/blender/editors/object/object_ops.c +++ b/source/blender/editors/object/object_ops.c @@ -72,10 +72,10 @@ void ED_operatortypes_object(void) WM_operatortype_append(OBJECT_OT_editmode_toggle); WM_operatortype_append(OBJECT_OT_posemode_toggle); WM_operatortype_append(OBJECT_OT_proxy_make); - WM_operatortype_append(OBJECT_OT_restrictview_clear); - WM_operatortype_append(OBJECT_OT_restrictview_set); - WM_operatortype_append(OBJECT_OT_restrictrender_clear); - WM_operatortype_append(OBJECT_OT_restrictrender_set); + WM_operatortype_append(OBJECT_OT_hide_view_clear); + WM_operatortype_append(OBJECT_OT_hide_view_set); + WM_operatortype_append(OBJECT_OT_hide_render_clear); + WM_operatortype_append(OBJECT_OT_hide_render_set); WM_operatortype_append(OBJECT_OT_shade_smooth); WM_operatortype_append(OBJECT_OT_shade_flat); WM_operatortype_append(OBJECT_OT_paths_calculate); @@ -318,14 +318,14 @@ void ED_keymap_object(wmKeyConfig *keyconf) WM_keymap_verify_item(keymap, "OBJECT_OT_scale_clear", SKEY, KM_PRESS, KM_ALT, 0); WM_keymap_verify_item(keymap, "OBJECT_OT_origin_clear", OKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "OBJECT_OT_restrictview_clear", HKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "OBJECT_OT_restrictview_set", HKEY, KM_PRESS, 0, 0); - RNA_boolean_set(WM_keymap_add_item(keymap, "OBJECT_OT_restrictview_set", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1); + WM_keymap_add_item(keymap, "OBJECT_OT_hide_view_clear", HKEY, KM_PRESS, KM_ALT, 0); + WM_keymap_add_item(keymap, "OBJECT_OT_hide_view_set", HKEY, KM_PRESS, 0, 0); + RNA_boolean_set(WM_keymap_add_item(keymap, "OBJECT_OT_hide_view_set", HKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "unselected", 1); /* same as above but for rendering */ - WM_keymap_add_item(keymap, "OBJECT_OT_restrictrender_clear", HKEY, KM_PRESS, KM_ALT|KM_CTRL, 0); - WM_keymap_add_item(keymap, "OBJECT_OT_restrictrender_set", HKEY, KM_PRESS, KM_CTRL, 0); -// RNA_boolean_set(WM_keymap_add_item(keymap, "OBJECT_OT_restrictrender_set", HKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "unselected", 1); // conflicts, removing + WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_clear", HKEY, KM_PRESS, KM_ALT|KM_CTRL, 0); + WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_set", HKEY, KM_PRESS, KM_CTRL, 0); +// RNA_boolean_set(WM_keymap_add_item(keymap, "OBJECT_OT_hide_render_set", HKEY, KM_PRESS, KM_SHIFT|KM_CTRL, 0)->ptr, "unselected", 1); // conflicts, removing WM_keymap_add_item(keymap, "OBJECT_OT_move_to_layer", MKEY, KM_PRESS, 0, 0); diff --git a/source/blender/editors/space_nla/nla_buttons.c b/source/blender/editors/space_nla/nla_buttons.c index 81d4e8b6b01..494e42ea2c8 100644 --- a/source/blender/editors/space_nla/nla_buttons.c +++ b/source/blender/editors/space_nla/nla_buttons.c @@ -322,7 +322,7 @@ static void nla_panel_properties(const bContext *C, Panel *pa) column= uiLayoutColumn(layout, 1); uiLayoutSetActive(column, !(RNA_boolean_get(&strip_ptr, "animated_influence") || RNA_boolean_get(&strip_ptr, "animated_time"))); uiItemL(column, "Playback Settings:", 0); - uiItemR(column, &strip_ptr, "muted", 0, NULL, 0); + uiItemR(column, &strip_ptr, "mute", 0, NULL, 0); uiItemR(column, &strip_ptr, "reversed", 0, NULL, 0); } diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index 95e2cb920fc..3cdc2437c45 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -5115,17 +5115,17 @@ static void outliner_draw_restrictbuts(uiBlock *block, Scene *scene, ARegion *ar uiBlockSetEmboss(block, UI_EMBOSSN); bt= uiDefIconButR(block, ICONTOG, 0, ICON_RESTRICT_VIEW_OFF, (int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_VIEWX, (short)te->ys, 17, OL_H-1, - &ptr, "restrict_view", -1, 0, 0, -1, -1, NULL); + &ptr, "hide", -1, 0, 0, -1, -1, NULL); uiButSetFunc(bt, restrictbutton_view_cb, scene, ob); bt= uiDefIconButR(block, ICONTOG, 0, ICON_RESTRICT_SELECT_OFF, (int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_SELECTX, (short)te->ys, 17, OL_H-1, - &ptr, "restrict_select", -1, 0, 0, -1, -1, NULL); + &ptr, "hide_select", -1, 0, 0, -1, -1, NULL); uiButSetFunc(bt, restrictbutton_sel_cb, scene, ob); bt= uiDefIconButR(block, ICONTOG, 0, ICON_RESTRICT_RENDER_OFF, (int)ar->v2d.cur.xmax-OL_TOG_RESTRICT_RENDERX, (short)te->ys, 17, OL_H-1, - &ptr, "restrict_render", -1, 0, 0, -1, -1, NULL); + &ptr, "hide_render", -1, 0, 0, -1, -1, NULL); uiButSetFunc(bt, restrictbutton_rend_cb, scene, ob); uiBlockSetEmboss(block, UI_EMBOSS); diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index 1f542e2babe..64adb16c9c7 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -326,14 +326,14 @@ static void rna_def_action_group(BlenderRNA *brna) RNA_def_property_collection_funcs(prop, 0, "rna_ActionGroup_channels_next", 0, 0, 0, 0, 0); RNA_def_property_ui_text(prop, "Channels", "F-Curves in this group"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_SELECTED); - RNA_def_property_ui_text(prop, "Selected", "Action Group is selected"); + RNA_def_property_ui_text(prop, "Select", "Action Group is selected"); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_SELECTED, NULL); - prop= RNA_def_property(srna, "locked", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", AGRP_PROTECTED); - RNA_def_property_ui_text(prop, "Locked", "Action Group is locked"); + RNA_def_property_ui_text(prop, "Lock", "Action Group is locked"); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); prop= RNA_def_property(srna, "expanded", PROP_BOOLEAN, PROP_NONE); diff --git a/source/blender/makesrna/intern/rna_animviz.c b/source/blender/makesrna/intern/rna_animviz.c index 985521fe2c6..a85f19e7be4 100644 --- a/source/blender/makesrna/intern/rna_animviz.c +++ b/source/blender/makesrna/intern/rna_animviz.c @@ -104,9 +104,9 @@ static void rna_def_animviz_motionpath_vert(BlenderRNA *brna) RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Coordinates", ""); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", MOTIONPATH_VERT_SEL); - RNA_def_property_ui_text(prop, "Selected", "Path point is selected for editing"); + RNA_def_property_ui_text(prop, "Select", "Path point is selected for editing"); } static void rna_def_animviz_motion_path(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_armature.c b/source/blender/makesrna/intern/rna_armature.c index 9239378f496..437a22b6692 100644 --- a/source/blender/makesrna/intern/rna_armature.c +++ b/source/blender/makesrna/intern/rna_armature.c @@ -443,7 +443,7 @@ static void rna_def_bone_common(StructRNA *srna, int editbone) RNA_def_property_ui_text(prop, "Cyclic Offset", "When bone doesn't have a parent, it receives cyclic offset effects"); RNA_def_property_update(prop, 0, "rna_Armature_update_data"); - prop= RNA_def_property(srna, "restrict_select", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide_select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_UNSELECTABLE); RNA_def_property_ui_text(prop, "Selectable", "Bone is able to be selected"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); @@ -523,14 +523,14 @@ static void rna_def_bone(BlenderRNA *brna) rna_def_bone_common(srna, 0); // XXX should we define this in PoseChannel wrapping code instead? but PoseChannels directly get some of their flags from here... - prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_HIDDEN_P); - RNA_def_property_ui_text(prop, "Hidden", "Bone is not visible when it is not in Edit Mode (i.e. in Object or Pose Modes)"); + RNA_def_property_ui_text(prop, "Hide", "Bone is not visible when it is not in Edit Mode (i.e. in Object or Pose Modes)"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_SELECTED); - RNA_def_property_ui_text(prop, "Selected", ""); + RNA_def_property_ui_text(prop, "Select", ""); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); /* XXX better matrix descriptions possible (Arystan) */ @@ -604,29 +604,29 @@ static void rna_def_edit_bone(BlenderRNA *brna) rna_def_bone_common(srna, 1); - prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_HIDDEN_A); - RNA_def_property_ui_text(prop, "Hidden", "Bone is not visible when in Edit Mode"); + RNA_def_property_ui_text(prop, "Hide", "Bone is not visible when in Edit Mode"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); - prop= RNA_def_property(srna, "locked", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_EDITMODE_LOCKED); - RNA_def_property_ui_text(prop, "Locked", "Bone is not able to be transformed when in Edit Mode"); + RNA_def_property_ui_text(prop, "Lock", "Bone is not able to be transformed when in Edit Mode"); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_SELECTED); - RNA_def_property_ui_text(prop, "Selected", ""); + RNA_def_property_ui_text(prop, "Select", ""); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); - prop= RNA_def_property(srna, "selected_head", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select_head", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_ROOTSEL); - RNA_def_property_ui_text(prop, "Head Selected", ""); + RNA_def_property_ui_text(prop, "Head Select", ""); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); - prop= RNA_def_property(srna, "selected_tail", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select_tail", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BONE_TIPSEL); - RNA_def_property_ui_text(prop, "Tail Selected", ""); + RNA_def_property_ui_text(prop, "Tail Select", ""); RNA_def_property_update(prop, 0, "rna_Armature_redraw_data"); /* calculated and read only, not actual data access */ diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index 218ca55e72d..9e004cd5946 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -305,9 +305,9 @@ static void rna_def_curvemappoint(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Handle Type", "Curve interpolation at this point: bezier or vector"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CUMA_SELECT); - RNA_def_property_ui_text(prop, "Selected", "Selection state of the curve point"); + RNA_def_property_ui_text(prop, "Select", "Selection state of the curve point"); } static void rna_def_curvemap(BlenderRNA *brna) diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index fb19e8976c3..1c6c35a88de 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -1034,7 +1034,7 @@ static void rna_def_constraint_locked_track(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Track Axis", "Axis that points to the target object"); RNA_def_property_update(prop, NC_OBJECT|ND_CONSTRAINT, "rna_Constraint_update"); - prop= RNA_def_property(srna, "locked", PROP_ENUM, PROP_NONE); + prop= RNA_def_property(srna, "lock", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "lockflag"); RNA_def_property_enum_items(prop, lock_items); RNA_def_property_ui_text(prop, "Locked Axis", "Axis that points upward"); diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index d8bc683ae12..9301e8dd142 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -525,14 +525,14 @@ static void rna_def_bpoint(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "SplinePoint", "Spline point without handles"); /* Boolean values */ - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "f1", 0); - RNA_def_property_ui_text(prop, "Selected", "Selection status"); + RNA_def_property_ui_text(prop, "Select", "Selection status"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "hide", 0); - RNA_def_property_ui_text(prop, "Hidden", "Visibility status"); + RNA_def_property_ui_text(prop, "Hide", "Visibility status"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); /* Vector value */ @@ -578,24 +578,24 @@ static void rna_def_beztriple(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Bezier Curve Point", "Bezier curve point with two handles"); /* Boolean values */ - prop= RNA_def_property(srna, "selected_handle1", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select_left_handle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "f1", 0); RNA_def_property_ui_text(prop, "Handle 1 selected", "Handle 1 selection status"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "selected_handle2", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select_right_handle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "f3", 0); RNA_def_property_ui_text(prop, "Handle 2 selected", "Handle 2 selection status"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "selected_control_point", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select_control_point", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "f2", 0); RNA_def_property_ui_text(prop, "Control Point selected", "Control point selection status"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); - prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "hide", 0); - RNA_def_property_ui_text(prop, "Hidden", "Visibility status"); + RNA_def_property_ui_text(prop, "Hide", "Visibility status"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); /* Enums */ diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c index d798753d123..cd58b6574be 100644 --- a/source/blender/makesrna/intern/rna_fcurve.c +++ b/source/blender/makesrna/intern/rna_fcurve.c @@ -940,7 +940,7 @@ static void rna_def_fmodifier(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Expanded", "F-Curve Modifier's panel is expanded in UI"); RNA_def_property_ui_icon(prop, ICON_TRIA_RIGHT, 1); - prop= RNA_def_property(srna, "muted", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", FMODIFIER_FLAG_MUTED); RNA_def_property_ui_text(prop, "Muted", "F-Curve Modifier will not be evaluated"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_PROP, NULL); @@ -1156,9 +1156,9 @@ static void rna_def_fpoint(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "F-Curve Sample", "Sample point for F-Curve"); /* Boolean values */ - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", 1); - RNA_def_property_ui_text(prop, "Selected", "Selection status"); + RNA_def_property_ui_text(prop, "Select", "Selection status"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL); /* Vector value */ @@ -1183,19 +1183,19 @@ static void rna_def_fkeyframe(BlenderRNA *brna) RNA_def_struct_ui_text(srna, "Keyframe", "Bezier curve point with two handles defining a Keyframe on an F-Curve"); /* Boolean values */ - prop= RNA_def_property(srna, "selected_handle1", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select_left_handle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "f1", 0); RNA_def_property_ui_text(prop, "Handle 1 selected", "Handle 1 selection status"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL); - prop= RNA_def_property(srna, "selected_handle2", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select_right_handle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "f3", 0); RNA_def_property_ui_text(prop, "Handle 2 selected", "Handle 2 selection status"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select_control_point", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "f2", 0); - RNA_def_property_ui_text(prop, "Selected", "Control point selection status"); + RNA_def_property_ui_text(prop, "Select", "Control point selection status"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL); /* Enums */ @@ -1384,17 +1384,17 @@ static void rna_def_fcurve(BlenderRNA *brna) RNA_def_property_update(prop, NC_ANIMATION, NULL); /* Flags */ - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", FCURVE_SELECTED); - RNA_def_property_ui_text(prop, "Selected", "F-Curve is selected for editing"); + RNA_def_property_ui_text(prop, "Select", "F-Curve is selected for editing"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME|NA_SELECTED, NULL); - prop= RNA_def_property(srna, "locked", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", FCURVE_PROTECTED); - RNA_def_property_ui_text(prop, "Locked", "F-Curve's settings cannot be edited"); + RNA_def_property_ui_text(prop, "Lock", "F-Curve's settings cannot be edited"); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); - prop= RNA_def_property(srna, "muted", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", FCURVE_MUTED); RNA_def_property_ui_text(prop, "Muted", "F-Curve is not evaluated"); RNA_def_property_update(prop, NC_ANIMATION|ND_ANIMCHAN|NA_EDITED, NULL); @@ -1404,15 +1404,15 @@ static void rna_def_fcurve(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Auto Clamped Handles", "All auto-handles for F-Curve are clamped"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_PROP, NULL); - prop= RNA_def_property(srna, "visible", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", FCURVE_VISIBLE); - RNA_def_property_ui_text(prop, "Visible", "F-Curve and its keyframes are shown in the Graph Editor graphs"); + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", FCURVE_VISIBLE); + RNA_def_property_ui_text(prop, "Hide", "F-Curve and its keyframes are hidden in the Graph Editor graphs"); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_GRAPH, NULL); - + /* State Info (for Debugging) */ - prop= RNA_def_property(srna, "disabled", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flag", FCURVE_DISABLED); - RNA_def_property_ui_text(prop, "Disabled", "F-Curve could not be evaluated in past, so should be skipped when evaluating"); + prop= RNA_def_property(srna, "enabled", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", FCURVE_DISABLED); + RNA_def_property_ui_text(prop, "Enabled", "False when F-Curve could not be evaluated in past, so should be skipped when evaluating"); RNA_def_property_update(prop, NC_ANIMATION|ND_KEYFRAME_PROP, NULL); /* Collections */ diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index a503eab4ba9..0994f67879e 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -135,9 +135,9 @@ static void rna_def_gpencil_frame(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_FRAME_PAINT); // XXX should it be editable? RNA_def_property_ui_text(prop, "Paint Lock", "Frame is being edited (painted on)"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_FRAME_SELECT); - RNA_def_property_ui_text(prop, "Selected", "Frame is selected for editing in the DopeSheet"); + RNA_def_property_ui_text(prop, "Select", "Frame is selected for editing in the DopeSheet"); } static void rna_def_gpencil_layer(BlenderRNA *brna) @@ -203,7 +203,7 @@ static void rna_def_gpencil_layer(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Hide", "Set layer Visibility"); RNA_def_property_update(prop, NC_SCREEN|ND_GPENCIL, NULL); - prop= RNA_def_property(srna, "locked", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_LOCKED); RNA_def_property_ui_text(prop, "Locked", "Protect layer from further editing and/or frame changes"); RNA_def_property_update(prop, NC_SCREEN|ND_GPENCIL, NULL); @@ -219,9 +219,9 @@ static void rna_def_gpencil_layer(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Active", "Set active layer for editing"); RNA_def_property_update(prop, NC_SCREEN|ND_GPENCIL, NULL); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_LAYER_SELECT); - RNA_def_property_ui_text(prop, "Selected", "Layer is selected for editing in the DopeSheet"); + RNA_def_property_ui_text(prop, "Select", "Layer is selected for editing in the DopeSheet"); RNA_def_property_update(prop, NC_SCREEN|ND_GPENCIL, NULL); // XXX keep this option? diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index b289373f349..8330e0dc32c 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1106,14 +1106,14 @@ static void rna_def_mvert(BlenderRNA *brna) RNA_def_property_float_funcs(prop, "rna_MeshVertex_normal_get", "rna_MeshVertex_normal_set", NULL); RNA_def_property_ui_text(prop, "Normal", "Vertex Normal"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT); - RNA_def_property_ui_text(prop, "Selected", ""); + RNA_def_property_ui_text(prop, "Select", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); - prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_HIDE); - RNA_def_property_ui_text(prop, "Hidden", ""); + RNA_def_property_ui_text(prop, "Hide", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); prop= RNA_def_property(srna, "bevel_weight", PROP_FLOAT, PROP_NONE); @@ -1159,14 +1159,14 @@ static void rna_def_medge(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Bevel Weight", "Weight used by the Bevel modifier"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT); - RNA_def_property_ui_text(prop, "Selected", ""); + RNA_def_property_ui_text(prop, "Select", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); - prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_HIDE); - RNA_def_property_ui_text(prop, "Hidden", ""); + RNA_def_property_ui_text(prop, "Hide", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); prop= RNA_def_property(srna, "seam", PROP_BOOLEAN, PROP_NONE); @@ -1226,14 +1226,14 @@ static void rna_def_mface(BlenderRNA *brna) RNA_def_property_int_funcs(prop, NULL, NULL, "rna_MeshFace_material_index_range"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_FACE_SEL); - RNA_def_property_ui_text(prop, "Selected", ""); + RNA_def_property_ui_text(prop, "Select", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); - prop= RNA_def_property(srna, "hidden", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_HIDE); - RNA_def_property_ui_text(prop, "Hidden", ""); + RNA_def_property_ui_text(prop, "Hide", ""); RNA_def_property_update(prop, 0, "rna_Mesh_update_select"); prop= RNA_def_property(srna, "smooth", PROP_BOOLEAN, PROP_NONE); @@ -1383,7 +1383,7 @@ static void rna_def_mtface(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Transparency", "Transparency blending mode"); RNA_def_property_update(prop, 0, "rna_Mesh_update_data"); - prop= RNA_def_property(srna, "uv_selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select_uv", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", TF_SEL1); RNA_def_property_array(prop, 4); RNA_def_property_ui_text(prop, "UV Selected", ""); diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c index accb40d2223..59c7607e930 100644 --- a/source/blender/makesrna/intern/rna_nla.c +++ b/source/blender/makesrna/intern/rna_nla.c @@ -422,11 +422,11 @@ static void rna_def_nlastrip(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", NLASTRIP_FLAG_ACTIVE); RNA_def_property_ui_text(prop, "Active", "NLA Strip is active"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", NLASTRIP_FLAG_SELECT); - RNA_def_property_ui_text(prop, "Selected", "NLA Strip is selected"); + RNA_def_property_ui_text(prop, "Select", "NLA Strip is selected"); - prop= RNA_def_property(srna, "muted", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", NLASTRIP_FLAG_MUTED); RNA_def_property_ui_text(prop, "Muted", "NLA Strip is not evaluated"); @@ -468,15 +468,15 @@ static void rna_def_nlatrack(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "flag", NLATRACK_SOLO); RNA_def_property_ui_text(prop, "Solo", "NLA Track is evaluated itself (i.e. active Action and all other NLA Tracks in the same AnimData block are disabled)"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", NLATRACK_SELECTED); - RNA_def_property_ui_text(prop, "Selected", "NLA Track is selected"); + RNA_def_property_ui_text(prop, "Select", "NLA Track is selected"); - prop= RNA_def_property(srna, "muted", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "mute", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", NLATRACK_MUTED); RNA_def_property_ui_text(prop, "Muted", "NLA Track is not evaluated"); - prop= RNA_def_property(srna, "locked", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "lock", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", NLATRACK_PROTECTED); RNA_def_property_ui_text(prop, "Locked", "NLA Track is locked"); } diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index e45a776eea2..8b285c42e11 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1538,9 +1538,9 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_LIB_EXCEPTION); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_layer_update"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT); - RNA_def_property_ui_text(prop, "Selected", "Object selection state"); + RNA_def_property_ui_text(prop, "Select", "Object selection state"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_select_update"); /* for data access */ @@ -1842,19 +1842,19 @@ static void rna_def_object(BlenderRNA *brna) RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Object_particle_update"); /* restrict */ - prop= RNA_def_property(srna, "restrict_view", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", OB_RESTRICT_VIEW); RNA_def_property_ui_text(prop, "Restrict View", "Restrict visibility in the viewport"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_VIEW_OFF, 1); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); - prop= RNA_def_property(srna, "restrict_select", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide_select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", OB_RESTRICT_SELECT); RNA_def_property_ui_text(prop, "Restrict Select", "Restrict selection in the viewport"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_SELECT_OFF, 1); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, NULL); - prop= RNA_def_property(srna, "restrict_render", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "hide_render", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "restrictflag", OB_RESTRICT_RENDER); RNA_def_property_ui_text(prop, "Restrict Render", "Restrict renderability"); RNA_def_property_ui_icon(prop, ICON_RESTRICT_RENDER_OFF, 1); @@ -2111,9 +2111,9 @@ static void rna_def_object_base(BlenderRNA *brna) RNA_def_property_boolean_funcs(prop, NULL, "rna_Base_layer_set"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Base_layer_update"); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", BA_SELECT); - RNA_def_property_ui_text(prop, "Selected", "Object base selection state"); + RNA_def_property_ui_text(prop, "Select", "Object base selection state"); RNA_def_property_update(prop, NC_OBJECT|ND_DRAW, "rna_Base_select_update"); RNA_api_object_base(srna); diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index 211583e3df6..21ece0ac4a9 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -698,9 +698,9 @@ static void rna_def_pose_channel(BlenderRNA *brna) RNA_def_property_editable_func(prop, "rna_PoseChannel_proxy_editable"); RNA_def_struct_name_property(srna, prop); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "selectflag", BONE_SELECTED); - RNA_def_property_ui_text(prop, "Selected", ""); + RNA_def_property_ui_text(prop, "Select", ""); /* Baked Bone Path cache data */ rna_def_motionpath_common(srna); diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index f46efb675ca..7adf4e7d35d 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -776,17 +776,17 @@ static void rna_def_sequence(BlenderRNA *brna) /* flags */ - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SELECT); - RNA_def_property_ui_text(prop, "Selected", ""); + RNA_def_property_ui_text(prop, "Select", ""); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER|NA_SELECTED, NULL); - prop= RNA_def_property(srna, "left_handle_selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select_left_handle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_LEFTSEL); RNA_def_property_ui_text(prop, "Left Handle Selected", ""); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER|NA_SELECTED, NULL); - prop= RNA_def_property(srna, "right_handle_selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select_right_handle", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_RIGHTSEL); RNA_def_property_ui_text(prop, "Right Handle Selected", ""); RNA_def_property_update(prop, NC_SCENE|ND_SEQUENCER|NA_SELECTED, NULL); diff --git a/source/blender/makesrna/intern/rna_timeline.c b/source/blender/makesrna/intern/rna_timeline.c index afc1d087cf2..a436c746910 100644 --- a/source/blender/makesrna/intern/rna_timeline.c +++ b/source/blender/makesrna/intern/rna_timeline.c @@ -55,9 +55,9 @@ static void rna_def_timeline_marker(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Frame", "The frame on which the timeline marker appears"); RNA_def_property_update(prop, NC_ANIMATION, NULL); - prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "select", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", 1 /*SELECT*/); - RNA_def_property_ui_text(prop, "Selected", "Marker selection state"); + RNA_def_property_ui_text(prop, "Select", "Marker selection state"); RNA_def_property_update(prop, NC_ANIMATION, NULL); #ifdef DURIAN_CAMERA_SWITCH diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index a03488d3878..32d69e48adf 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1622,10 +1622,10 @@ static void rna_def_userdef_theme_colorset(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Normal", "Color used for the surface of bones"); RNA_def_property_update(prop, 0, "rna_userdef_update"); - prop= RNA_def_property(srna, "selected", PROP_FLOAT, PROP_COLOR); + prop= RNA_def_property(srna, "select", PROP_FLOAT, PROP_COLOR); RNA_def_property_float_sdna(prop, NULL, "select"); RNA_def_property_array(prop, 3); - RNA_def_property_ui_text(prop, "Selected", "Color used for selected bones"); + RNA_def_property_ui_text(prop, "Select", "Color used for selected bones"); RNA_def_property_update(prop, 0, "rna_userdef_update"); prop= RNA_def_property(srna, "active", PROP_FLOAT, PROP_COLOR); diff --git a/source/blender/makesrna/rna_cleanup/rna_booleans.txt b/source/blender/makesrna/rna_cleanup/rna_booleans.txt index 87d4f8a0736..5c98ef7b9ad 100644 --- a/source/blender/makesrna/rna_cleanup/rna_booleans.txt +++ b/source/blender/makesrna/rna_cleanup/rna_booleans.txt @@ -1,7 +1,6 @@ ActionActuator.continue_last_frame -> use_continue_last_frame: boolean Restore last frame when switching on/off, otherwise play from the start each time ActionGroup.expanded -> show_expanded: boolean Action Group is expanded -ActionGroup.locked -> lock: boolean Action Group is locked -ActionGroup.selected -> select: boolean Action Group is selected + Actuator.expanded -> show_expanded: boolean Set actuator expanded in the user interface AnimData.nla_enabled -> use_nla: boolean NLA stack is evaluated when evaluating this block AnimVizMotionPaths.highlight_keyframes -> show_keyframe_highlight: boolean Emphasize position of keyframes on Motion Paths @@ -40,10 +39,7 @@ ArrayModifier.merge_end_vertices -> use_merge_end_vertices: boolean Merge ArrayModifier.relative_offset -> use_relative_offset: boolean Add an offset relative to the object's bounding box BackgroundImage.show_expanded -> show_expanded: boolean Show the expanded in the user interface BevelModifier.only_vertices -> use_only_vertices: boolean Bevel verts/corners, not edges -BezierSplinePoint.hidden -> hide: boolean Visibility status -BezierSplinePoint.selected_control_point -> select_control_point: boolean Control point selection status -BezierSplinePoint.selected_handle1 -> select_left_handle: boolean Handle 1 selection status -BezierSplinePoint.selected_handle2 -> select_right_handle: boolean Handle 2 selection status + BoidRule.in_air -> use_in_air: boolean Use rule when boid is flying BoidRule.on_land -> use_on_land: boolean Use rule when boid is on land BoidRuleAvoid.predict -> use_predict: boolean Predict target movement @@ -58,14 +54,12 @@ Bone.connected -> use_connect: boolean, (read-only) When bone has a parent Bone.cyclic_offset -> use_cyclic_offset: boolean When bone doesn't have a parent, it receives cyclic offset effects Bone.deform -> use_deform: boolean Bone does not deform any geometry Bone.draw_wire -> show_wire: boolean Bone is always drawn as Wireframe regardless of viewport draw mode. Useful for non-obstructive custom bone shapes -Bone.hidden -> hide: boolean Bone is not visible when it is not in Edit Mode (i.e. in Object or Pose Modes) + Bone.hinge -> use_hinge: boolean Bone inherits rotation or scale from parent bone Bone.inherit_scale -> use_inherit_scale: boolean Bone inherits scaling from parent bone Bone.layer -> layer: boolean Layers bone exists in Bone.local_location -> use_local_location: boolean Bone location is set in local space Bone.multiply_vertexgroup_with_envelope -> use_envelope_multiply: boolean When deforming bone, multiply effects of Vertex Group weights with Envelope influence -Bone.restrict_select -> hide_select: boolean Bone is able to be selected -Bone.selected -> select: boolean BooleanProperty.default -> default: boolean, (read-only) Default value for this number BooleanProperty.default_array -> default_array: boolean, (read-only) Default value for this array Brush.use_accumulate -> use_accumulate: boolean Accumulate stroke dabs on top of each other @@ -180,7 +174,7 @@ Curve.use_path_follow -> use_path_follow: boolean Make curve path children Curve.use_radius -> use_radius: boolean Option for paths: apply the curve radius with path following it and deforming Curve.use_stretch -> use_stretch: boolean Option for curve-deform: makes deformed child to stretch along entire path Curve.use_time_offset -> use_time_offset: boolean Children will use Time Offset value as path distance offset -CurveMapPoint.selected -> select: boolean Selection state of the curve point + CurveMapping.clip -> use_clip: boolean Force the curve view to fit a defined boundary DelaySensor.repeat -> use_repeat: boolean Toggle repeat option. If selected, the sensor restarts after Delay+Dur logic tics DomainFluidSettings.generate_speed_vectors -> use_speed_vectors: boolean Generate speed vectors for vector blur @@ -214,17 +208,13 @@ EditBone.connected -> use_connect: boolean When bone has a parent, bone's EditBone.cyclic_offset -> use_cyclic_offset: boolean When bone doesn't have a parent, it receives cyclic offset effects EditBone.deform -> use_deform: boolean Bone does not deform any geometry EditBone.draw_wire -> show_wire: boolean Bone is always drawn as Wireframe regardless of viewport draw mode. Useful for non-obstructive custom bone shapes -EditBone.hidden -> hide: boolean Bone is not visible when in Edit Mode + EditBone.hinge -> use_hinge: boolean Bone inherits rotation or scale from parent bone EditBone.inherit_scale -> use_inherit_scale: boolean Bone inherits scaling from parent bone EditBone.layer -> layer: boolean Layers bone exists in EditBone.local_location -> use_local_location: boolean Bone location is set in local space -EditBone.locked -> lock: boolean Bone is not able to be transformed when in Edit Mode EditBone.multiply_vertexgroup_with_envelope -> use_envelope_multiply: boolean When deforming bone, multiply effects of Vertex Group weights with Envelope influence -EditBone.restrict_select -> hide_select: boolean Bone is able to be selected -EditBone.selected -> select: boolean -EditBone.selected_head -> select_head: boolean -EditBone.selected_tail -> select_tail: boolean + EditObjectActuator.enable_3d_tracking -> use_3d_tracking: boolean Enable 3D tracking EditObjectActuator.local_angular_velocity -> use_local_angular_velocity: boolean Apply the rotation locally EditObjectActuator.local_linear_velocity -> use_local_linear_velocity: boolean Apply the transformation locally @@ -257,16 +247,9 @@ ExplodeModifier.size -> use_size: boolean Use particle size for the shrapn ExplodeModifier.split_edges -> use_edge_split: boolean Split face edges for nicer shrapnel ExplodeModifier.unborn -> show_unborn: boolean Show mesh when particles are unborn FCurve.auto_clamped_handles -> use_auto_handle_clamp: boolean All auto-handles for F-Curve are clamped -NEGATE * FCurve.disabled -> enabled: boolean F-Curve could not be evaluated in past, so should be skipped when evaluating -FCurve.locked -> lock: boolean F-Curve's settings cannot be edited -FCurve.muted -> mute: boolean F-Curve is not evaluated -FCurve.selected -> select: boolean F-Curve is selected for editing -NEGATE * FCurve.visible -> hide: boolean F-Curve and its keyframes are shown in the Graph Editor graphs -FCurveSample.selected -> select: boolean Selection status FModifier.active -> active: boolean F-Curve Modifier is the one being edited NEGATE * FModifier.disabled -> enabled: boolean, (read-only) F-Curve Modifier has invalid settings and will not be evaluated FModifier.expanded -> show_expanded: boolean F-Curve Modifier's panel is expanded in UI -FModifier.muted -> mute: boolean F-Curve Modifier will not be evaluated FModifierFunctionGenerator.additive -> use_additive: boolean Values generated by this modifier are applied on top of the existing values instead of overwriting them FModifierGenerator.additive -> use_additive: boolean Values generated by this modifier are applied on top of the existing values instead of overwriting them FModifierLimits.use_maximum_x -> use_max_x: boolean Use the maximum X value @@ -314,12 +297,10 @@ FollowPathConstraint.use_fixed_position -> use_fixed_location: boolean Obj Function.registered -> is_registered: boolean, (read-only) Function is registered as callback as part of type registration Function.registered_optional -> is_registered_optional: boolean, (read-only) Function is optionally registered as callback part of type registration GPencilFrame.paint_lock -> is_edited: boolean Frame is being edited (painted on) -GPencilFrame.selected -> select: boolean Frame is selected for editing in the DopeSheet GPencilLayer.active -> active: boolean Set active layer for editing GPencilLayer.frame_lock -> lock_frame: boolean Lock current frame displayed by layer GPencilLayer.hide -> hide: boolean Set layer Visibility -GPencilLayer.locked -> lock: boolean Protect layer from further editing and/or frame changes -GPencilLayer.selected -> select: boolean Layer is selected for editing in the DopeSheet + GPencilLayer.show_points -> show_points: boolean Draw the points which make up the strokes (for debugging purposes) GPencilLayer.use_onion_skinning -> use_onion_skinning: boolean Ghost frames on either side of frame GameBooleanProperty.value -> value: boolean Property value @@ -420,9 +401,6 @@ KeyMapItem.expanded -> show_expanded: boolean Show key map event and prope KeyMapItem.oskey -> oskey: boolean Operating system key pressed KeyMapItem.shift -> shift: boolean Shift key pressed KeyboardSensor.all_keys -> use_all_keys: boolean Trigger this sensor on any keystroke -Keyframe.selected -> select: boolean Control point selection status -Keyframe.selected_handle1 -> select_left_handle: boolean Handle 1 selection status -Keyframe.selected_handle2 -> select_right_handle: boolean Handle 2 selection status KeyingSet.absolute -> use_absolute: boolean Keying Set defines specific paths/settings to be keyframed (i.e. is not reliant on context info) KeyingSet.insertkey_needed -> use_insertkey_needed: boolean Only insert keyframes where they're needed in the relevant F-Curves KeyingSet.insertkey_visual -> use_insertkey_visual: boolean Insert keyframes based on 'visual transforms' @@ -568,13 +546,10 @@ MeshDeformModifier.dynamic -> dynamic: boolean Recompute binding dynamical MeshDeformModifier.invert -> invert_vertex_group: boolean Invert vertex group influence MeshDeformModifier.is_bound -> is_bound: boolean, (read-only) Whether geometry has been bound to control cage MeshEdge.fgon -> is_fgon: boolean, (read-only) Fgon edge -MeshEdge.hidden -> hide: boolean MeshEdge.loose -> is_loose: boolean, (read-only) Loose edge MeshEdge.seam -> use_seam: boolean Seam edge for UV unwrapping -MeshEdge.selected -> select: boolean MeshEdge.sharp -> use_sharp: boolean Sharp edge for the EdgeSplit modifier -MeshFace.hidden -> hide: boolean -MeshFace.selected -> select: boolean + MeshFace.smooth -> use_smooth: boolean MeshTextureFace.alpha_sort -> use_alpha_sort: boolean Enable sorting of faces for correct alpha drawing (slow, use Clip Alpha instead when possible) MeshTextureFace.billboard -> use_billboard: boolean Billboard with Z-axis constraint @@ -589,12 +564,10 @@ MeshTextureFace.tex -> use_texture: boolean Render face with texture MeshTextureFace.text -> use_bitmap_text: boolean Enable bitmap text on face MeshTextureFace.twoside -> use_twoside: boolean Render face two-sided MeshTextureFace.uv_pinned -> uv_pin: boolean -MeshTextureFace.uv_selected -> uv_select: boolean +MeshTextureFace.uv_selected -> select_uv: boolean MeshTextureFaceLayer.active -> active: boolean Sets the layer as active for display and editing MeshTextureFaceLayer.active_clone -> active_clone: boolean Sets the layer as active for cloning MeshTextureFaceLayer.active_render -> active_render: boolean Sets the layer as active for rendering -MeshVertex.hidden -> hide: boolean -MeshVertex.selected -> select: boolean MetaBall.auto_texspace -> use_auto_texspace: boolean Adjusts active object's texture space automatically when transforming object MetaElement.hide -> hide: boolean Hide element MetaElement.negative -> use_negative: boolean Set metaball as negative one @@ -624,7 +597,6 @@ Modifier.realtime -> show_realtime: boolean Realtime display of a modifier Modifier.render -> use_render: boolean Use modifier during rendering MotionPath.editing -> is_edited: boolean Path is being edited MotionPath.use_bone_head -> use_bone_head: boolean, (read-only) For PoseBone paths, use the bone head location when calculating this path -MotionPathVert.selected -> select: boolean Path point is selected for editing MovieSequence.convert_float -> use_float: boolean Convert input to float data MovieSequence.de_interlace -> use_deinterlace: boolean For video movies to remove fields MovieSequence.flip_x -> use_flip_x: boolean Flip on the X axis @@ -663,11 +635,7 @@ NlaStrip.animated_time_cyclic -> use_animated_time_cyclic: boolean Cycle t NlaStrip.auto_blending -> use_auto_blend: boolean Number of frames for Blending In/Out is automatically determined from overlapping strips NlaStrip.muted -> mute: boolean NLA Strip is not evaluated NlaStrip.reversed -> use_reverse: boolean NLA Strip is played back in reverse order (only when timing is automatically determined) -NlaStrip.selected -> select: boolean NLA Strip is selected NlaTrack.active -> active: boolean, (read-only) NLA Track is active -NlaTrack.locked -> lock: boolean NLA Track is locked -NlaTrack.muted -> mute: boolean NLA Track is not evaluated -NlaTrack.selected -> select: boolean NLA Track is selected NlaTrack.solo -> is_solo: boolean, (read-only) NLA Track is evaluated itself (i.e. active Action and all other NLA Tracks in the same AnimData block are disabled) Object.draw_axis -> show_axis: boolean Displays the object's origin and axis Object.draw_bounds -> show_bounds: boolean Displays the object's bounds @@ -682,10 +650,7 @@ Object.lock_rotation -> lock_rotation: boolean Lock editing of rotation in Object.lock_rotation_w -> lock_rotation_w: boolean Lock editing of 'angle' component of four-component rotations in the interface Object.lock_rotations_4d -> lock_rotations_4d: boolean Lock editing of four component rotations by components (instead of as Eulers) Object.lock_scale -> lock_scale: boolean Lock editing of scale in the interface -Object.restrict_render -> hide_render: boolean Restrict renderability -Object.restrict_select -> hide_select: boolean Restrict selection in the viewport -Object.restrict_view -> hide: boolean Restrict visibility in the viewport -Object.selected -> select: boolean Object selection state + Object.shape_key_edit_mode -> use_shape_key_edit_mode: boolean Apply shape keys in edit mode (for Meshes only) Object.shape_key_lock -> show_shape_key: boolean Always show the current Shape for this Object Object.slow_parent -> use_slow_parent: boolean Create a delay in the parent relationship @@ -708,7 +673,6 @@ ObjectActuator.servo_limit_x -> use_servo_limit_x: boolean Set limit to fo ObjectActuator.servo_limit_y -> use_servo_limit_y: boolean Set limit to force along the Y axis ObjectActuator.servo_limit_z -> use_servo_limit_z: boolean Set limit to force along the Z axis ObjectBase.layers -> layer: boolean Layers the object base is on -ObjectBase.selected -> select: boolean Object base selection state ObstacleFluidSettings.active -> use: boolean Object contributes to the fluid simulation ObstacleFluidSettings.export_animated_mesh -> use_animated_mesh: boolean Export this mesh as an animated one. Slower, only use if really necessary (e.g. armatures or parented objects), animated pos/rot/scale IPOs do not require it Operator.has_reports -> has_reports: boolean, (read-only) Operator has a set of reports (warnings and errors) from last execution @@ -825,7 +789,7 @@ PoseBone.lock_rotation -> lock_rotation: boolean Lock editing of rotation PoseBone.lock_rotation_w -> lock_rotation_w: boolean Lock editing of 'angle' component of four-component rotations in the interface PoseBone.lock_rotations_4d -> lock_rotations_4d: boolean Lock editing of four component rotations by components (instead of as Eulers) PoseBone.lock_scale -> lock_scale: boolean Lock editing of scale in the interface -PoseBone.selected -> select: boolean + PoseTemplateSettings.generate_def_rig -> use_generate_deform_rig: boolean Create a copy of the metarig, constrainted by the generated rig Property.is_never_none -> is_never_none: boolean, (read-only) True when this value can't be set to None Property.is_readonly -> is_readonly: boolean, (read-only) Property is editable through RNA @@ -1037,11 +1001,8 @@ Sensor.pulse_false_level -> use_pulse_false_level: boolean Activate FALSE Sensor.pulse_true_level -> use_pulse_true_level: boolean Activate TRUE level triggering (pulse mode) Sensor.tap -> use_tap: boolean Trigger controllers only for an instant, even while the sensor remains true Sequence.frame_locked -> use_frame_lock: boolean Lock the animation curve to the global frame counter -Sequence.left_handle_selected -> select_left_handle: boolean Sequence.lock -> lock: boolean Lock strip so that it can't be transformed Sequence.mute -> mute: boolean -Sequence.right_handle_selected -> select_right_handle: boolean -Sequence.selected -> select: boolean Sequence.use_effect_default_fade -> use_default_fade: boolean Fade effect using the built-in default (usually make transition as long as effect strip) SequenceColorBalance.inverse_gain -> invert_gain: boolean SequenceColorBalance.inverse_gamma -> invert_gamma: boolean @@ -1208,8 +1169,7 @@ SplineIKConstraint.chain_offset -> use_chain_offset: boolean Offset the en SplineIKConstraint.even_divisions -> use_even_divisions: boolean Ignore the relative lengths of the bones when fitting to the curve SplineIKConstraint.use_curve_radius -> use_curve_radius: boolean Average radius of the endpoints is used to tweak the X and Z Scaling of the bones, on top of XZ Scale mode SplineIKConstraint.y_stretch -> use_y_stretch: boolean Stretch the Y axis of the bones to fit the curve -SplinePoint.hidden -> hide: boolean Visibility status -SplinePoint.selected -> select_control_point: boolean Selection status + SpotLamp.auto_clip_end -> use_auto_clip_end: boolean Automatic calculation of clipping-end, based on visible vertices SpotLamp.auto_clip_start -> use_auto_clip_start: boolean Automatic calculation of clipping-start, based on visible vertices SpotLamp.halo -> use_halo: boolean Renders spotlight with a volumetric halo (Buffer Shadows) @@ -1251,7 +1211,6 @@ TextureSlot.rgb_to_intensity -> use_rgb_to_intensity: boolean Converts tex TextureSlot.stencil -> use_stencil: boolean Use this texture as a blending value on the next texture ThemeBoneColorSet.colored_constraints -> show_colored_constraints: boolean Allow the use of colors indicating constraints/keyed status ThemeWidgetColors.shaded -> show_shaded: boolean -TimelineMarker.selected -> select: boolean Marker selection state ToolSettings.auto_normalize -> use_auto_normalize: boolean Ensure all bone-deforming vertex groups add up to 1.0 while weight painting ToolSettings.automerge_editing -> use_automerge_editing: boolean Automatically merge vertices moved to the same location ToolSettings.bone_sketching -> use_bone_sketching: boolean DOC BROKEN |