[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50459] trunk/blender/source/blender/ editors: code cleanup
Campbell Barton
ideasman42 at gmail.com
Fri Sep 7 01:41:04 CEST 2012
Revision: 50459
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50459
Author: campbellbarton
Date: 2012-09-06 23:41:03 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
code cleanup
Modified Paths:
--------------
trunk/blender/source/blender/editors/mesh/editmesh_bvh.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform.c
Modified: trunk/blender/source/blender/editors/mesh/editmesh_bvh.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_bvh.c 2012-09-06 23:10:01 UTC (rev 50458)
+++ trunk/blender/source/blender/editors/mesh/editmesh_bvh.c 2012-09-06 23:41:03 UTC (rev 50459)
@@ -394,15 +394,15 @@
float co1[3], co2[3], co3[3], dir1[4], dir2[4], dir3[4];
float origin[3], invmat[4][4];
float epsilon = 0.01f;
- float mval_f[2], end[3];
+ float end[3];
+ const float mval_f[2] = {ar->winx / 2.0f,
+ ar->winy / 2.0f};
if (!ar) {
printf("error in BMBVH_EdgeVisible!\n");
return 0;
}
-
- mval_f[0] = ar->winx / 2.0f;
- mval_f[1] = ar->winy / 2.0f;
+
ED_view3d_win_to_segment_clip(ar, v3d, mval_f, origin, end);
invert_m4_m4(invmat, obedit->obmat);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-09-06 23:10:01 UTC (rev 50458)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2012-09-06 23:41:03 UTC (rev 50459)
@@ -751,11 +751,9 @@
float nor[3] = {0.0, 0.0, 0.0};
/* 2D normal calc */
- float mval_f[2];
+ const float mval_f[2] = {(float)event->mval[0],
+ (float)event->mval[1]};
- mval_f[0] = (float)event->mval[0];
- mval_f[1] = (float)event->mval[1];
-
/* check for edges that are half selected, use for rotation */
done = FALSE;
BM_ITER_MESH (eed, &iter, vc.em->bm, BM_EDGES_OF_MESH) {
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c 2012-09-06 23:10:01 UTC (rev 50458)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c 2012-09-06 23:41:03 UTC (rev 50459)
@@ -3540,7 +3540,7 @@
switch (pset->brushtype) {
case PE_BRUSH_COMB:
{
- float mval_f[2];
+ const float mval_f[2] = {dx, dy};
data.mval= mval;
data.rad= (float)brush->size;
@@ -3552,8 +3552,6 @@
invert_m4_m4(ob->imat, ob->obmat);
- mval_f[0]= dx;
- mval_f[1]= dy;
ED_view3d_win_to_delta(ar, mval_f, vec);
data.dvec= vec;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c 2012-09-06 23:10:01 UTC (rev 50458)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c 2012-09-06 23:41:03 UTC (rev 50459)
@@ -159,14 +159,12 @@
{
Object *ob = vc->obact;
float delta[3], scale, loc[3];
- float mval_f[2];
+ const float mval_f[2] = {pixel_radius, 0.0f};
mul_v3_m4v3(loc, ob->obmat, center);
initgrabz(vc->rv3d, loc[0], loc[1], loc[2]);
- mval_f[0] = pixel_radius;
- mval_f[1] = 0.0f;
ED_view3d_win_to_delta(vc->ar, mval_f, delta);
scale = fabsf(mat4_to_scale(ob->obmat));
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2012-09-06 23:10:01 UTC (rev 50458)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2012-09-06 23:41:03 UTC (rev 50459)
@@ -1027,14 +1027,12 @@
Scene *scene = vc.scene;
ToolSettings *ts = vc.scene->toolsettings;
Brush *brush = paint_brush(&ts->wpaint->paint);
- float mval_f[2];
+ const float mval_f[2] = {(float)event->mval[0],
+ (float)event->mval[1]};
int v_idx_best = -1;
int fidx;
float len_best = FLT_MAX;
- mval_f[0] = (float)event->mval[0];
- mval_f[1] = (float)event->mval[1];
-
fidx = mp->totloop - 1;
do {
float co[3], sco[3], len;
@@ -1098,10 +1096,12 @@
if (me && me->dvert && vc.v3d && vc.rv3d) {
int index;
+ int mval[2] = {win->eventstate->x - vc.ar->winrct.xmin,
+ win->eventstate->y - vc.ar->winrct.ymin};
view3d_operator_needs_opengl(C);
- index = view3d_sample_backbuf(&vc, win->eventstate->x - vc.ar->winrct.xmin, win->eventstate->y - vc.ar->winrct.ymin);
+ index = view3d_sample_backbuf(&vc, mval[0], mval[1]);
if (index && index <= me->totpoly) {
const int defbase_tot = BLI_countlist(&vc.obact->defbase);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-09-06 23:10:01 UTC (rev 50458)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-09-06 23:41:03 UTC (rev 50459)
@@ -1389,14 +1389,17 @@
{
unsigned int col;
- if (x >= vc->ar->winx || y >= vc->ar->winy) return 0;
+ if (x >= vc->ar->winx || y >= vc->ar->winy) {
+ return 0;
+ }
+
x += vc->ar->winrct.xmin;
y += vc->ar->winrct.ymin;
view3d_validate_backbuf(vc);
- glReadPixels(x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &col);
- glReadBuffer(GL_BACK);
+ glReadPixels(x, y, 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, &col);
+ glReadBuffer(GL_BACK);
if (ENDIAN_ORDER == B_ENDIAN) {
BLI_endian_switch_uint32(&col);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-09-06 23:10:01 UTC (rev 50458)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2012-09-06 23:41:03 UTC (rev 50459)
@@ -475,8 +475,8 @@
{
/* for dolly */
- float mval_f[2];
- VECCOPY2D(mval_f, event->mval);
+ const float mval_f[2] = {(float)event->mval[0],
+ (float)event->mval[1]};
ED_view3d_win_to_vector(vod->ar, mval_f, vod->mousevec);
}
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2012-09-06 23:10:01 UTC (rev 50458)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_select.c 2012-09-06 23:41:03 UTC (rev 50459)
@@ -119,8 +119,8 @@
initgrabz(vc->rv3d, fp[0], fp[1], fp[2]);
if (mval_cpy[0] != IS_CLIPPED) {
- float mval_f[2];
- VECSUB2D(mval_f, mval_cpy, mval);
+ const float mval_f[2] = {(float)(mval_cpy[0] - mval[0]),
+ (float)(mval_cpy[1] - mval[1])};
ED_view3d_win_to_delta(vc->ar, mval_f, dvec);
sub_v3_v3(fp, dvec);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2012-09-06 23:10:01 UTC (rev 50458)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2012-09-06 23:41:03 UTC (rev 50459)
@@ -87,8 +87,9 @@
void view3d_region_operator_needs_opengl(wmWindow *win, ARegion *ar)
{
/* for debugging purpose, context should always be OK */
- if ((ar == NULL) || (ar->regiontype != RGN_TYPE_WINDOW))
+ if ((ar == NULL) || (ar->regiontype != RGN_TYPE_WINDOW)) {
printf("view3d_region_operator_needs_opengl error, wrong region\n");
+ }
else {
RegionView3D *rv3d = ar->regiondata;
Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c 2012-09-06 23:10:01 UTC (rev 50458)
+++ trunk/blender/source/blender/editors/transform/transform.c 2012-09-06 23:41:03 UTC (rev 50459)
@@ -164,9 +164,7 @@
void convertViewVec(TransInfo *t, float r_vec[3], int dx, int dy)
{
if ((t->spacetype == SPACE_VIEW3D) && (t->ar->regiontype == RGN_TYPE_WINDOW)) {
- float mval_f[2];
- mval_f[0] = dx;
- mval_f[1] = dy;
+ const float mval_f[2] = {(float)dx, (float)dy};
ED_view3d_win_to_delta(t->ar, mval_f, r_vec);
}
else if (t->spacetype == SPACE_IMAGE) {
More information about the Bf-blender-cvs
mailing list