blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 745 Projects 19 Wiki Activity

Revert "3D Cursor: Add option to lock it in place to prevent accidental modification" 

This reverts commit a791153ca5.

Rather users get feedback on changing cursor-depth,
instead of preventing 3d-cursor placement entirely.
This commit is contained in:
Campbell Barton 2015-12-17 14:54:06 +11:00
parent d970f02ee1
commit 9f84d5e546
4 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -3005,12 +3005,7 @@ class VIEW3D_PT_view3d_cursor(Panel):
layout = self.layout
view = context.space_data
layout.prop(view, "lock_cursor_location")
col = layout.column()
col.active = not view.lock_cursor_location
col.prop(view, "cursor_location", text="Location")
layout.column().prop(view, "cursor_location", text="Location")
class VIEW3D_PT_view3d_name(Panel):

17
source/blender/editors/space_view3d/view3d_edit.c
View File

@ -4679,21 +4679,9 @@ static int view3d_cursor3d_invoke(bContext *C, wmOperator *UNUSED(op), const wmE
return OPERATOR_FINISHED;
}
static int view3d_cursor3d_poll(bContext *C)
{
if (ED_operator_region_view3d_active(C)) {
View3D *v3d = CTX_wm_view3d(C);
/* only if not locked */
if ((v3d->flag & V3D_LOCK_CURSOR) == 0)
return true;
}
return false;
}
void VIEW3D_OT_cursor3d(wmOperatorType *ot)
{
/* identifiers */
ot->name = "Set 3D Cursor";
ot->description = "Set the location of the 3D cursor";
@ -4701,7 +4689,8 @@ void VIEW3D_OT_cursor3d(wmOperatorType *ot)
/* api callbacks */
ot->invoke = view3d_cursor3d_invoke;
ot->poll = view3d_cursor3d_poll;
ot->poll = ED_operator_region_view3d_active;
/* flags */
// ot->flag = OPTYPE_REGISTER|OPTYPE_UNDO;

1
source/blender/makesdna/DNA_view3d_types.h
View File

@ -250,7 +250,6 @@ typedef struct View3D {
#define V3D_DISPBGPICS 2
#define V3D_HIDE_HELPLINES 4
#define V3D_INVALID_BACKBUF 8
#define V3D_LOCK_CURSOR 16
#define V3D_ALIGN 1024
#define V3D_SELECT_OUTLINE 2048

5
source/blender/makesrna/intern/rna_space.c
View File

@ -2392,11 +2392,6 @@ static void rna_def_space_view3d(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "ob_centre_cursor", 1);
RNA_def_property_ui_text(prop, "Lock to Cursor", "3D View center is locked to the cursor's position");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "lock_cursor_location", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", V3D_LOCK_CURSOR);
RNA_def_property_ui_text(prop, "Lock Cursor Location", "3D Cursor location is locked to prevent it from being accidentally moved");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "viewport_shade", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "drawtype");