Revision: 35444
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35444
Author: campbellbarton
Date: 2011-03-10 00:38:23 +0000 (Thu, 10 Mar 2011)
Log Message:
-----------
revert r35438, Martin doesn't like having this option tacked on.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35438
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesrna/intern/rna_scene.c
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2011-03-10 00:25:35 UTC
(rev 35443)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2011-03-10 00:38:23 UTC
(rev 35444)
@@ -98,8 +98,6 @@
row.prop(toolsettings, "use_snap_peel_object", text="")
elif toolsettings.snap_element == 'FACE':
row.prop(toolsettings, "use_snap_project", text="")
- if toolsettings.use_snap_project and obj.mode == 'EDIT':
- row.prop(toolsettings, "use_snap_project_self", text="")
# OpenGL render
row = layout.row(align=True)
Modified: trunk/blender/source/blender/editors/transform/transform.h
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.h 2011-03-10
00:25:35 UTC (rev 35443)
+++ trunk/blender/source/blender/editors/transform/transform.h 2011-03-10
00:38:23 UTC (rev 35444)
@@ -95,8 +95,7 @@
short modePoint;
short modeSelect;
short align;
- char project;
- char project_self;
+ short project;
short peel;
short status;
float snapPoint[3]; /* snapping from this point */
Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c
2011-03-10 00:25:35 UTC (rev 35443)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c
2011-03-10 00:38:23 UTC (rev 35444)
@@ -392,7 +392,7 @@
}
else
{
- t->tsnap.modeSelect = t->tsnap.project_self ?
SNAP_ALL : SNAP_NOT_OBEDIT;
+ t->tsnap.modeSelect = SNAP_ALL;
}
}
/* Particles edit mode*/
@@ -457,11 +457,6 @@
{
t->tsnap.project = RNA_boolean_get(op->ptr,
"use_snap_project");
}
-
- if (RNA_struct_find_property(op->ptr,
"use_snap_project_self"))
- {
- t->tsnap.project = RNA_boolean_get(op->ptr,
"use_snap_project_self");
- }
}
}
/* use scene defaults only when transform is modal */
@@ -473,7 +468,6 @@
t->tsnap.align = ((t->settings->snap_flag & SCE_SNAP_ROTATE) ==
SCE_SNAP_ROTATE);
t->tsnap.project = ((t->settings->snap_flag & SCE_SNAP_PROJECT)
== SCE_SNAP_PROJECT);
- t->tsnap.project_self = !((t->settings->snap_flag &
SCE_SNAP_PROJECT_NO_SELF) == SCE_SNAP_PROJECT_NO_SELF);
t->tsnap.peel = ((t->settings->snap_flag & SCE_SNAP_PROJECT) ==
SCE_SNAP_PROJECT);
}
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2011-03-10
00:25:35 UTC (rev 35443)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2011-03-10
00:38:23 UTC (rev 35444)
@@ -1073,7 +1073,6 @@
#define SCE_SNAP_ROTATE 2
#define SCE_SNAP_PEEL_OBJECT 4
#define SCE_SNAP_PROJECT 8
-#define SCE_SNAP_PROJECT_NO_SELF 16
/* toolsettings->snap_target */
#define SCE_SNAP_TARGET_CLOSEST 0
#define SCE_SNAP_TARGET_CENTER 1
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-03-10
00:25:35 UTC (rev 35443)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-03-10
00:38:23 UTC (rev 35444)
@@ -1143,12 +1143,6 @@
RNA_def_property_ui_text(prop, "Project Individual Elements", "Project
individual elements on the surface of other objects");
RNA_def_property_ui_icon(prop, ICON_RETOPO, 0);
RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /*
header redraw */
-
- prop= RNA_def_property(srna, "use_snap_project_self", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_boolean_negative_sdna(prop, NULL, "snap_flag",
SCE_SNAP_PROJECT_NO_SELF);
- RNA_def_property_ui_text(prop, "Project to Self", "Project into its
self (editmode)");
- RNA_def_property_ui_icon(prop, ICON_ORTHO, 0);
- RNA_def_property_update(prop, NC_SCENE|ND_TOOLSETTINGS, NULL); /*
header redraw */
/* Grease Pencil */
prop = RNA_def_property(srna, "use_grease_pencil_sessions",
PROP_BOOLEAN, PROP_NONE);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
