[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55772] trunk/blender/source/blender/ editors/transform: fix for error in previous commit where the center would not be set in some cases , also use bools in more plaes.
Campbell Barton
ideasman42 at gmail.com
Thu Apr 4 11:48:06 CEST 2013
Revision: 55772
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55772
Author: campbellbarton
Date: 2013-04-04 09:48:06 +0000 (Thu, 04 Apr 2013)
Log Message:
-----------
fix for error in previous commit where the center would not be set in some cases, also use bools in more plaes.
Modified Paths:
--------------
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/transform/transform_constraints.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/editors/transform/transform_snap.c
Modified: trunk/blender/source/blender/editors/transform/transform.h
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.h 2013-04-04 09:20:46 UTC (rev 55771)
+++ trunk/blender/source/blender/editors/transform/transform.h 2013-04-04 09:48:06 UTC (rev 55772)
@@ -72,7 +72,7 @@
short target;
short modePoint;
short modeSelect;
- short align;
+ bool align;
char project;
char snap_self;
short peel;
@@ -593,7 +593,7 @@
void remake_graph_transdata(TransInfo *t, struct ListBase *anim_data);
void flushTransUVs(TransInfo *t);
void flushTransParticles(TransInfo *t);
-int clipUVTransform(TransInfo *t, float *vec, int resize);
+bool clipUVTransform(TransInfo *t, float vec[2], const bool resize);
void clipUVData(TransInfo *t);
void flushTransNodes(TransInfo *t);
void flushTransSeq(TransInfo *t);
@@ -628,8 +628,8 @@
void constraintNumInput(TransInfo *t, float vec[3]);
-int isLockConstraint(TransInfo *t);
-int getConstraintSpaceDimension(TransInfo *t);
+bool isLockConstraint(TransInfo *t);
+int getConstraintSpaceDimension(TransInfo *t);
char constraintModeToChar(TransInfo *t);
void startConstraint(TransInfo *t);
@@ -652,21 +652,21 @@
void snapGrid(TransInfo *t, float *val);
void snapGridAction(TransInfo *t, float *val, GearsType action);
-int activeSnap(TransInfo *t);
-int validSnap(TransInfo *t);
+bool activeSnap(TransInfo *t);
+bool validSnap(TransInfo *t);
void initSnapping(struct TransInfo *t, struct wmOperator *op);
void applyProject(TransInfo *t);
void applySnapping(TransInfo *t, float *vec);
void resetSnapping(TransInfo *t);
-int handleSnapping(TransInfo *t, const struct wmEvent *event);
+bool handleSnapping(TransInfo *t, const struct wmEvent *event);
void drawSnapping(const struct bContext *C, TransInfo *t);
-int usingSnappingNormal(TransInfo *t);
-int validSnappingNormal(TransInfo *t);
+bool usingSnappingNormal(TransInfo *t);
+bool validSnappingNormal(TransInfo *t);
void getSnapPoint(TransInfo *t, float vec[3]);
void addSnapPoint(TransInfo *t);
-int updateSelectedSnapPoint(TransInfo *t);
+bool updateSelectedSnapPoint(TransInfo *t);
void removeSnapPoint(TransInfo *t);
/********************** Mouse Input ******************************/
@@ -729,8 +729,8 @@
struct TransformOrientation *createBoneSpace(struct bContext *C, struct ReportList *reports, char *name, int overwrite);
/* Those two fill in mat and return non-zero on success */
-int createSpaceNormal(float mat[3][3], float normal[3]);
-int createSpaceNormalTangent(float mat[3][3], float normal[3], float tangent[3]);
+bool createSpaceNormal(float mat[3][3], const float normal[3]);
+bool createSpaceNormalTangent(float mat[3][3], float normal[3], float tangent[3]);
struct TransformOrientation *addMatrixSpace(struct bContext *C, float mat[3][3], char name[], int overwrite);
void applyTransformOrientation(const struct bContext *C, float mat[3][3], char *name);
Modified: trunk/blender/source/blender/editors/transform/transform_constraints.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_constraints.c 2013-04-04 09:20:46 UTC (rev 55771)
+++ trunk/blender/source/blender/editors/transform/transform_constraints.c 2013-04-04 09:48:06 UTC (rev 55772)
@@ -1001,20 +1001,20 @@
}
-int isLockConstraint(TransInfo *t)
+bool isLockConstraint(TransInfo *t)
{
int mode = t->con.mode;
if ((mode & (CON_AXIS0 | CON_AXIS1)) == (CON_AXIS0 | CON_AXIS1))
- return 1;
+ return true;
if ((mode & (CON_AXIS1 | CON_AXIS2)) == (CON_AXIS1 | CON_AXIS2))
- return 1;
+ return true;
if ((mode & (CON_AXIS0 | CON_AXIS2)) == (CON_AXIS0 | CON_AXIS2))
- return 1;
+ return true;
- return 0;
+ return false;
}
/*
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-04-04 09:20:46 UTC (rev 55771)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-04-04 09:48:06 UTC (rev 55772)
@@ -125,7 +125,7 @@
/* local function prototype - for Object/Bone Constraints */
-static short constraints_list_needinv(TransInfo *t, ListBase *list);
+static bool constraints_list_needinv(TransInfo *t, ListBase *list);
/* ************************** Functions *************************** */
@@ -1895,8 +1895,8 @@
//else
td->loc = eve->co;
copy_v3_v3(td->iloc, td->loc);
+ copy_v3_v3(td->center, td->loc);
-
if (t->around == V3D_LOCAL) {
BMElem *ele;
bool is_axismat_set = false;
@@ -1929,8 +1929,6 @@
}
}
else {
- copy_v3_v3(td->center, td->loc);
-
/* Setting normals */
copy_v3_v3(td->axismtx[2], eve->no);
td->axismtx[0][0] =
@@ -2530,7 +2528,7 @@
}
}
-int clipUVTransform(TransInfo *t, float *vec, int resize)
+bool clipUVTransform(TransInfo *t, float vec[2], const bool resize)
{
TransData *td;
int a, clipx = 1, clipy = 1;
@@ -2601,16 +2599,16 @@
/* ********************* ANIMATION EDITORS (GENERAL) ************************* */
/* This function tests if a point is on the "mouse" side of the cursor/frame-marking */
-static short FrameOnMouseSide(char side, float frame, float cframe)
+static bool FrameOnMouseSide(char side, float frame, float cframe)
{
/* both sides, so it doesn't matter */
- if (side == 'B') return 1;
+ if (side == 'B') return true;
/* only on the named side */
if (side == 'R')
- return (frame >= cframe) ? 1 : 0;
+ return (frame >= cframe);
else
- return (frame <= cframe) ? 1 : 0;
+ return (frame <= cframe);
}
/* ********************* NLA EDITOR ************************* */
@@ -4550,7 +4548,7 @@
* These particular constraints benefit from this, but others don't, hence
* this semi-hack ;-) - Aligorith
*/
-static short constraints_list_needinv(TransInfo *t, ListBase *list)
+static bool constraints_list_needinv(TransInfo *t, ListBase *list)
{
bConstraint *con;
@@ -4563,26 +4561,30 @@
if ((con->flag & CONSTRAINT_DISABLE) == 0 && (con->enforce != 0.0f)) {
/* (affirmative) returns for specific constraints here... */
/* constraints that require this regardless */
- if (con->type == CONSTRAINT_TYPE_CHILDOF) return 1;
- if (con->type == CONSTRAINT_TYPE_FOLLOWPATH) return 1;
- if (con->type == CONSTRAINT_TYPE_CLAMPTO) return 1;
- if (con->type == CONSTRAINT_TYPE_OBJECTSOLVER) return 1;
- if (con->type == CONSTRAINT_TYPE_FOLLOWTRACK) return 1;
-
+ if (ELEM5(con->type,
+ CONSTRAINT_TYPE_CHILDOF,
+ CONSTRAINT_TYPE_FOLLOWPATH,
+ CONSTRAINT_TYPE_CLAMPTO,
+ CONSTRAINT_TYPE_OBJECTSOLVER,
+ CONSTRAINT_TYPE_FOLLOWTRACK))
+ {
+ return true;
+ }
+
/* constraints that require this only under special conditions */
if (con->type == CONSTRAINT_TYPE_ROTLIKE) {
/* CopyRot constraint only does this when rotating, and offset is on */
bRotateLikeConstraint *data = (bRotateLikeConstraint *)con->data;
if ((data->flag & ROTLIKE_OFFSET) && (t->mode == TFM_ROTATION))
- return 1;
+ return true;
}
}
}
}
/* no appropriate candidates found */
- return 0;
+ return false;
}
/* transcribe given object into TransData for Transforming */
@@ -4590,8 +4592,8 @@
{
Scene *scene = t->scene;
float obmtx[3][3];
- short constinv;
- short skip_invert = 0;
+ bool constinv;
+ bool skip_invert = false;
if (t->mode != TFM_DUMMY && ob->rigidbody_object) {
float rot[3][3], scale[3];
@@ -4629,15 +4631,15 @@
/* disable constraints inversion for dummy pass */
if (t->mode == TFM_DUMMY)
- skip_invert = 1;
+ skip_invert = true;
- if (skip_invert == 0 && constinv == 0) {
- if (constinv == 0)
+ if (skip_invert == false && constinv == false) {
+ if (constinv == false)
ob->transflag |= OB_NO_CONSTRAINTS; /* BKE_object_where_is_calc_time checks this */
BKE_object_where_is_calc(t->scene, ob);
- if (constinv == 0)
+ if (constinv == false)
ob->transflag &= ~OB_NO_CONSTRAINTS;
}
else
@@ -4789,19 +4791,19 @@
}
}
-static int mark_children(Object *ob)
+static bool mark_children(Object *ob)
{
if (ob->flag & (SELECT | BA_TRANSFORM_CHILD))
- return 1;
+ return true;
if (ob->parent) {
if (mark_children(ob->parent)) {
ob->flag |= BA_TRANSFORM_CHILD;
- return 1;
+ return true;
}
}
- return 0;
+ return false;
}
static int count_proportional_objects(TransInfo *t)
Modified: trunk/blender/source/blender/editors/transform/transform_orientations.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_orientations.c 2013-04-04 09:20:46 UTC (rev 55771)
+++ trunk/blender/source/blender/editors/transform/transform_orientations.c 2013-04-04 09:48:06 UTC (rev 55772)
@@ -213,13 +213,13 @@
return addMatrixSpace(C, mat, name, overwrite);
}
-int createSpaceNormal(float mat[3][3], float normal[3])
+bool createSpaceNormal(float mat[3][3], const float normal[3])
{
float tangent[3] = {0.0f, 0.0f, 1.0f};
copy_v3_v3(mat[2], normal);
if (normalize_v3(mat[2]) == 0.0f) {
- return 0; /* error return */
+ return false; /* error return */
}
cross_v3_v3v3(mat[0], mat[2], tangent);
@@ -233,14 +233,14 @@
normalize_m3(mat);
- return 1;
+ return true;
}
-int createSpaceNormalTangent(float mat[3][3], float normal[3], float tangent[3])
+bool createSpaceNormalTangent(float mat[3][3], float normal[3], float tangent[3])
{
copy_v3_v3(mat[2], normal);
if (normalize_v3(mat[2]) == 0.0f) {
- return 0; /* error return */
+ return false; /* error return */
}
/* preempt zero length tangent from causing trouble */
@@ -250,14 +250,14 @@
cross_v3_v3v3(mat[0], mat[2], tangent);
if (normalize_v3(mat[0]) == 0.0f) {
- return 0; /* error return */
+ return false; /* error return */
}
cross_v3_v3v3(mat[1], mat[2], mat[0]);
normalize_m3(mat);
- return 1;
+ return true;
}
TransformOrientation *addMatrixSpace(bContext *C, float mat[3][3], char name[], int overwrite)
Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c 2013-04-04 09:20:46 UTC (rev 55771)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list