[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53073] trunk/blender/source/blender: code cleanup: use 'const float *' when getting the 3d cursor and not editing it.
Campbell Barton
ideasman42 at gmail.com
Mon Dec 17 06:38:51 CET 2012
Revision: 53073
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53073
Author: campbellbarton
Date: 2012-12-17 05:38:50 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
code cleanup: use 'const float *' when getting the 3d cursor and not editing it.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_main.h
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/source/blender/blenkernel/BKE_main.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_main.h 2012-12-17 05:36:00 UTC (rev 53072)
+++ trunk/blender/source/blender/blenkernel/BKE_main.h 2012-12-17 05:38:50 UTC (rev 53073)
@@ -51,7 +51,7 @@
typedef struct Main {
struct Main *next, *prev;
char name[1024]; /* 1024 = FILE_MAX */
- short versionfile, subversionfile;
+ short versionfile, subversionfile; /* see BLENDER_VERSION, BLENDER_SUBVERSION */
short minversionfile, minsubversionfile;
int revision; /* svn revision of binary that saved file */
short recovered; /* indicate the main->name (file) is the recovered one */
@@ -92,6 +92,8 @@
char id_tag_update[256];
} Main;
+#define MAIN_VERSION_ATLEAST(main, ver, subver) \
+ ((main)->versionfile >= (ver) || (main->versionfile == (ver) && (main)->subversionfile >= (subver)))
#ifdef __cplusplus
}
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c 2012-12-17 05:36:00 UTC (rev 53072)
+++ trunk/blender/source/blender/editors/armature/editarmature.c 2012-12-17 05:38:50 UTC (rev 53073)
@@ -2062,7 +2062,7 @@
Scene *scene = CTX_data_scene(C);
View3D *v3d = CTX_wm_view3d(C); /* can be NULL */
float cursor_local[3];
- float *cursor = give_cursor(scene, v3d);
+ const float *cursor = give_cursor(scene, v3d);
copy_v3_v3(cursor_local, cursor);
@@ -2323,7 +2323,8 @@
View3D *v3d;
bArmature *arm;
EditBone *ebone, *newbone, *flipbone;
- float *curs, mat[3][3], imat[3][3];
+ float mat[3][3], imat[3][3];
+ const float *curs;
int a, to_root = 0;
Object *obedit;
Scene *scene;
@@ -2418,7 +2419,7 @@
Scene *scene;
ARegion *ar;
View3D *v3d;
- float *fp = NULL, tvec[3], oldcurs[3], mval_f[2];
+ float *fp, tvec[3], oldcurs[3], mval_f[2];
int retv;
scene = CTX_data_scene(C);
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2012-12-17 05:36:00 UTC (rev 53072)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2012-12-17 05:38:50 UTC (rev 53073)
@@ -451,7 +451,7 @@
copy_v3_v3(p3d, &pt->x);
}
else {
- float *fp = give_cursor(scene, v3d);
+ const float *fp = give_cursor(scene, v3d);
float mvalf[2];
/* get screen coordinate */
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2012-12-17 05:36:00 UTC (rev 53072)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2012-12-17 05:38:50 UTC (rev 53073)
@@ -208,7 +208,7 @@
static void gp_get_3d_reference(tGPsdata *p, float vec[3])
{
View3D *v3d = p->sa->spacedata.first;
- float *fp = give_cursor(p->scene, v3d);
+ const float *fp = give_cursor(p->scene, v3d);
/* the reference point used depends on the owner... */
#if 0 /* XXX: disabled for now, since we can't draw relative to the owner yet */
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-12-17 05:36:00 UTC (rev 53072)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-12-17 05:38:50 UTC (rev 53073)
@@ -906,7 +906,7 @@
BM_ELEM_SELECT, min);
}
else {
- float *curs = give_cursor(vc.scene, vc.v3d);
+ const float *curs = give_cursor(vc.scene, vc.v3d);
BMOperator bmop;
BMOIter oiter;
@@ -2033,7 +2033,8 @@
{
BMIter iter;
BMVert *v;
- float *vco = NULL, co[3], cent[3] = {0.0f, 0.0f, 0.0f};
+ float co[3], cent[3] = {0.0f, 0.0f, 0.0f};
+ const float *vco = NULL;
if (target) {
vco = give_cursor(scene, v3d);
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2012-12-17 05:36:00 UTC (rev 53072)
+++ trunk/blender/source/blender/editors/object/object_add.c 2012-12-17 05:38:50 UTC (rev 53073)
@@ -146,7 +146,7 @@
{
View3D *v3d = CTX_wm_view3d(C);
Scene *scene = CTX_data_scene(C);
- float *cursor;
+ const float *cursor;
cursor = give_cursor(scene, v3d);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-12-17 05:36:00 UTC (rev 53072)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-12-17 05:38:50 UTC (rev 53073)
@@ -3683,10 +3683,9 @@
ARegion *ar = CTX_wm_region(C);
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = CTX_wm_region_view3d(C);
- float *fp = NULL;
+ float *fp = give_cursor(scene, v3d);
float mval_fl[2];
int flip;
- fp = give_cursor(scene, v3d);
flip = initgrabz(rv3d, fp[0], fp[1], fp[2]);
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-12-17 05:36:00 UTC (rev 53072)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-12-17 05:38:50 UTC (rev 53073)
@@ -2579,7 +2579,8 @@
int Warp(TransInfo *t, const int UNUSED(mval[2]))
{
TransData *td = t->data;
- float vec[3], circumfac, dist, phi0, co, si, *curs, cursor[3], gcursor[3];
+ float vec[3], circumfac, dist, phi0, co, si, cursor[3], gcursor[3];
+ const float *curs;
int i;
char str[50];
Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c 2012-12-17 05:36:00 UTC (rev 53072)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c 2012-12-17 05:38:50 UTC (rev 53073)
@@ -1445,7 +1445,7 @@
void calculateCenterCursor(TransInfo *t)
{
- float *cursor;
+ const float *cursor;
cursor = give_cursor(t->scene, t->view);
copy_v3_v3(t->center, cursor);
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c 2012-12-17 05:36:00 UTC (rev 53072)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c 2012-12-17 05:38:50 UTC (rev 53073)
@@ -895,16 +895,18 @@
static void uv_map_transform_center(Scene *scene, View3D *v3d, float *result,
Object *ob, BMEditMesh *em)
{
- BMFace *efa;
- BMLoop *l;
- BMIter iter, liter;
- float min[3], max[3], *cursx;
int around = (v3d) ? v3d->around : V3D_CENTER;
/* only operates on the edit object - this is all that's needed now */
switch (around) {
case V3D_CENTER: /* bounding box center */
+ {
+ BMFace *efa;
+ BMLoop *l;
+ BMIter iter, liter;
+ float min[3], max[3];
+
INIT_MINMAX(min, max);
BM_ITER_MESH (efa, &iter, em->bm, BM_FACES_OF_MESH) {
@@ -916,17 +918,18 @@
}
mid_v3_v3v3(result, min, max);
break;
-
+ }
case V3D_CURSOR: /* cursor center */
- cursx = give_cursor(scene, v3d);
+ {
+ const float *curs = give_cursor(scene, v3d);
/* shift to objects world */
- sub_v3_v3v3(result, cursx, ob->obmat[3]);
+ sub_v3_v3v3(result, curs, ob->obmat[3]);
break;
-
+ }
case V3D_LOCAL: /* object center */
case V3D_CENTROID: /* multiple objects centers, only one object here*/
default:
- result[0] = result[1] = result[2] = 0.0;
+ zero_v3(result);
break;
}
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2012-12-17 05:36:00 UTC (rev 53072)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2012-12-17 05:38:50 UTC (rev 53073)
@@ -321,7 +321,7 @@
View3D *v3d = (View3D *)(ptr->data);
bScreen *sc = (bScreen *)ptr->id.data;
Scene *scene = (Scene *)sc->scene;
- float *loc = give_cursor(scene, v3d);
+ const float *loc = give_cursor(scene, v3d);
copy_v3_v3(values, loc);
}
More information about the Bf-blender-cvs
mailing list