Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Hnidek <jiri.hnidek@tul.cz>2005-01-03 23:49:02 +0300
committerJiri Hnidek <jiri.hnidek@tul.cz>2005-01-03 23:49:02 +0300
commitf9faa506a9a1a6ac16b5b3aa869c433e6beef53c (patch)
tree290cec94a92a0ca95123c66eb6fc9c1fbe44f8db /source/blender/src/edit.c
parentc851319b579fb6c588efbd65621b735182614a00 (diff)
- all snap operations work for MetaElems now
- snap to center creates displist for subsurf mesh
Diffstat (limited to 'source/blender/src/edit.c')
-rw-r--r--source/blender/src/edit.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/src/edit.c b/source/blender/src/edit.c
index 1412a7c5288..2f13446000b 100644
--- a/source/blender/src/edit.c
+++ b/source/blender/src/edit.c
@@ -736,9 +736,9 @@ void snap_sel_to_grid()
tottrans= 0;
#ifdef __NLA
- if ELEM5(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM6(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0);
#else
- if ELEM4(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM5(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0);
#endif
if(tottrans==0) return;
@@ -824,9 +824,9 @@ void snap_sel_to_curs()
if(G.obedit) {
tottrans= 0;
#ifdef __NLA
- if ELEM5(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM6(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0);
#else
- if ELEM4(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM5(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0);
#endif
if(tottrans==0) return;
@@ -927,9 +927,9 @@ void snap_curs_to_sel()
if(G.obedit) {
tottrans=0;
#ifdef __NLA
- if ELEM5(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM6(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0);
#else
- if ELEM4(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM5(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MABLL) make_trans_verts(bmat[0], bmat[1], 0);
#endif
if(tottrans==0) return;
@@ -1000,9 +1000,9 @@ void snap_curs_to_firstsel()
if(G.obedit) {
tottrans=0;
#ifdef __NLA
- if ELEM5(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM6(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0);
#else
- if ELEM4(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM5(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0);
#endif
if(tottrans==0) return;
@@ -1073,9 +1073,9 @@ void snap_to_center()
if(G.obedit) {
tottrans= 0;
#ifdef __NLA
- if ELEM5(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM6(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0);
#else
- if ELEM4(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM5(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0);
#endif
if(tottrans==0) return;
@@ -1135,9 +1135,9 @@ void snap_to_center()
if(G.obedit) {
tottrans= 0;
#ifdef __NLA
- if ELEM5(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM6(G.obedit->type, OB_ARMATURE, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0);
#else
- if ELEM4(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE) make_trans_verts(bmat[0], bmat[1], 0);
+ if ELEM5(G.obedit->type, OB_LATTICE, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) make_trans_verts(bmat[0], bmat[1], 0);
#endif
if(tottrans==0) return;
@@ -1160,7 +1160,7 @@ void snap_to_center()
MEM_freeN(transvmain);
transvmain= 0;
- if ELEM(G.obedit->type, OB_SURF, OB_CURVE) makeDispList(G.obedit);
+ if ELEM4(G.obedit->type, OB_MESH, OB_SURF, OB_CURVE, OB_MBALL) makeDispList(G.obedit);
special_trans_update(0);