griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- fix strange declaration of adduplicate that just used matrix argument

Browse Source 
as flag... confusing and weird.
This commit is contained in:
Daniel Dunbar
2005-06-21 14:51:57 +00:00
parent 50b4a5a958
commit 7e4e8b9a50
4 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/include/BDR_editobject.h
View File

@@ -97,7 +97,7 @@ void single_tex_users_expand(void);
void single_mat_users_expand(void);
void single_user(void);
void make_local(void);
void adduplicate(float *dtrans);
void adduplicate(int noTrans);
void selectlinks_menu(void);
void selectlinks(int nr);
void image_aspect(void);

5
source/blender/src/editcurve.c
View File

@@ -361,7 +361,6 @@ void separate_nurb()
Base *base, *oldbase;
Curve *cu;
ListBase editnurbo;
float trans[9];
if( (G.vd->lay & G.obedit->lay)==0 ) return;
@@ -407,10 +406,8 @@ void separate_nurb()
oldob= G.obedit;
oldbase= BASACT;
trans[0]=trans[1]=trans[2]=trans[3]=trans[4]=trans[5]= 0.0;
trans[6]=trans[7]=trans[8]= 1.0;
G.qual |= LR_ALTKEY; /* patch to make sure we get a linked dupli */
adduplicate(trans);
adduplicate(1);
G.qual &= ~LR_ALTKEY;
G.obedit= BASACT->object; /* basact is set in adduplicate() */

10
source/blender/src/editmesh.c
View File

@@ -1320,7 +1320,6 @@ void separate_mesh(void)
Mesh *me, *men;
Base *base, *oldbase;
ListBase edve, eded, edvl;
float trans[9];
TEST_EDITMESH
@@ -1394,10 +1393,8 @@ void separate_mesh(void)
oldob= G.obedit;
oldbase= BASACT;
trans[0]=trans[1]=trans[2]=trans[3]=trans[4]=trans[5]= 0.0;
trans[6]=trans[7]=trans[8]= 1.0;
G.qual |= LR_ALTKEY; /* patch to make sure we get a linked duplicate */
adduplicate(trans);
adduplicate(1);
G.qual &= ~LR_ALTKEY;
G.obedit= BASACT->object; /* basact was set in adduplicate() */
@@ -1449,7 +1446,6 @@ void separate_mesh_loose(void)
Mesh *me, *men;
Base *base, *oldbase;
ListBase edve, eded, edvl;
float trans[9];
int vertsep=0;
short done=0, check=1;
@@ -1563,10 +1559,8 @@ void separate_mesh_loose(void)
oldob= G.obedit;
oldbase= BASACT;
trans[0]=trans[1]=trans[2]=trans[3]=trans[4]=trans[5]= 0.0;
trans[6]=trans[7]=trans[8]= 1.0;
G.qual |= LR_ALTKEY; /* patch to make sure we get a linked duplicate */
adduplicate(trans);
adduplicate(1);
G.qual &= ~LR_ALTKEY;
G.obedit= BASACT->object; /* basact was set in adduplicate() */

4
source/blender/src/editobject.c
View File

@@ -3962,7 +3962,7 @@ void make_local(void)
}
void adduplicate(float *dtrans)
void adduplicate(int noTrans)
/* dtrans is 3 x 3xfloat dloc, drot en dsize */
{
Base *base, *basen;
@@ -4212,7 +4212,7 @@ void adduplicate(float *dtrans)
clear_id_newpoins();
countall();
if(dtrans==0) {
if(!noTrans) {
BIF_TransformSetUndo("Add Duplicate");
initTransform(TFM_TRANSLATION, CTX_NONE);
Transform();