[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45225] trunk/blender/source/blender: code cleanup: (dont include '; ' in defines), last commit also missed changes to paint_image.c
Campbell Barton
ideasman42 at gmail.com
Wed Mar 28 03:06:59 CEST 2012
Revision: 45225
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45225
Author: campbellbarton
Date: 2012-03-28 01:06:43 +0000 (Wed, 28 Mar 2012)
Log Message:
-----------
code cleanup: (dont include ';' in defines), last commit also missed changes to paint_image.c
Modified Paths:
--------------
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/imbuf/intern/tiff.c
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/modifiers/intern/MOD_explode.c
trunk/blender/source/blender/nodes/intern/node_socket.c
trunk/blender/source/blender/python/generic/bgl.h
Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c 2012-03-28 00:42:38 UTC (rev 45224)
+++ trunk/blender/source/blender/avi/intern/avi.c 2012-03-28 01:06:43 UTC (rev 45225)
@@ -53,7 +53,7 @@
static int AVI_DEBUG=0;
static char DEBUG_FCC[4];
-#define DEBUG_PRINT(x) if (AVI_DEBUG) printf("AVI DEBUG: " x);
+#define DEBUG_PRINT(x) if (AVI_DEBUG) { printf("AVI DEBUG: " x); } (void)0
/* local functions */
char *fcc_to_char (unsigned int fcc);
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-03-28 00:42:38 UTC (rev 45224)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2012-03-28 01:06:43 UTC (rev 45225)
@@ -1421,7 +1421,7 @@
float velocity[3];
float density;
} HairGridVert;
-#define HAIR_GRID_INDEX(vec, min, max, axis) (int)( (vec[axis] - min[axis]) / (max[axis] - min[axis]) * 9.99f );
+#define HAIR_GRID_INDEX(vec, min, max, axis) (int)((vec[axis] - min[axis]) / (max[axis] - min[axis]) * 9.99f)
/* Smoothing of hair velocities:
* adapted from
Volumetric Methods for Simulation and Rendering of Hair
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2012-03-28 00:42:38 UTC (rev 45224)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2012-03-28 01:06:43 UTC (rev 45225)
@@ -1679,7 +1679,7 @@
static void direct_link_script(FileData *UNUSED(fd), Script *script)
{
script->id.us = 1;
- SCRIPT_SET_NULL(script)
+ SCRIPT_SET_NULL(script);
}
@@ -5324,7 +5324,7 @@
if (scpt->script) {
scpt->script= newlibadr(fd, sc->id.lib, scpt->script);
if (scpt->script) {
- SCRIPT_SET_NULL(scpt->script)
+ SCRIPT_SET_NULL(scpt->script);
}
}
}
@@ -5599,7 +5599,7 @@
/*sc->script = NULL; - 2.45 set to null, better re-run the script */
if (scpt->script) {
- SCRIPT_SET_NULL(scpt->script)
+ SCRIPT_SET_NULL(scpt->script);
}
}
else if (sl->spacetype==SPACE_OUTLINER) {
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-03-28 00:42:38 UTC (rev 45224)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c 2012-03-28 01:06:43 UTC (rev 45225)
@@ -174,10 +174,10 @@
copy_v3_v3(verts[i], l->v->co);
}
- if(f->len == 3) {
+ if (f->len == 3) {
area = area_tri_v3(verts[0], verts[1], verts[2]);
}
- else if(f->len == 4) {
+ else if (f->len == 4) {
area = area_quad_v3(verts[0], verts[1], verts[2], verts[3]);
}
else {
@@ -321,7 +321,7 @@
axis_angle_to_quat(q, axis, (float)angle);
quat_to_mat3(mat, q);
- for (i = 0; i < nverts; i++)
+ for (i = 0; i < nverts; i++)
mul_m3_v3(mat, verts[i]);
}
@@ -334,7 +334,7 @@
BMFace *f;
f = BM_iter_new(&iter, bm, BM_FACES_OF_EDGE, e);
- for ( ; f; f = BM_iter_step(&iter)) {
+ for (; f; f = BM_iter_step(&iter)) {
BM_face_normal_update(bm, f);
}
@@ -435,7 +435,7 @@
}
}
/* exact same as 'bmesh_face_normal_update' but accepts vertex coords */
-void BM_face_normal_update_vcos(BMesh *UNUSED(bm), BMFace *f, float no[3],
+void BM_face_normal_update_vcos(BMesh *bm, BMFace *f, float no[3],
float const (*vertexCos)[3])
{
BMLoop *l;
@@ -507,26 +507,36 @@
return TRUE;
}
-#define GETMIN2_AXIS(a, b, ma, mb, axis) ma[axis] = MIN2(a[axis], b[axis]), mb[axis] = MAX2(a[axis], b[axis])
-#define GETMIN2(a, b, ma, mb) GETMIN2_AXIS(a, b, ma, mb, 0); GETMIN2_AXIS(a, b, ma, mb, 1);
+#define GETMIN2_AXIS(a, b, ma, mb, axis) \
+ { \
+ ma[axis] = MIN2(a[axis], b[axis]); \
+ mb[axis] = MAX2(a[axis], b[axis]); \
+ } (void)
+
+#define GETMIN2(a, b, ma, mb) \
+ { \
+ GETMIN2_AXIS(a, b, ma, mb, 0); \
+ GETMIN2_AXIS(a, b, ma, mb, 1); \
+ GETMIN2(v1, v2, mv1, mv2); \
+ GETMIN2(v3, v4, mv3, mv4); \
+ } (void)
- GETMIN2(v1, v2, mv1, mv2);
- GETMIN2(v3, v4, mv3, mv4);
-
/* do an interval test on the x and y axe */
/* first do x axi */
+
#define T (FLT_EPSILON * 15)
- if ( ABS(v1[1] - v2[1]) < T &&
- ABS(v3[1] - v4[1]) < T &&
- ABS(v1[1] - v3[1]) < T)
+
+ if (ABS(v1[1] - v2[1]) < T &&
+ ABS(v3[1] - v4[1]) < T &&
+ ABS(v1[1] - v3[1]) < T)
{
return (mv4[0] >= mv1[0] && mv3[0] <= mv2[0]);
}
/* now do y axi */
- if ( ABS(v1[0] - v2[0]) < T &&
- ABS(v3[0] - v4[0]) < T &&
- ABS(v1[0] - v3[0]) < T)
+ if (ABS(v1[0] - v2[0]) < T &&
+ ABS(v3[0] - v4[0]) < T &&
+ ABS(v1[0] - v3[0]) < T)
{
return (mv4[1] >= mv1[1] && mv3[1] <= mv2[1]);
}
@@ -826,7 +836,7 @@
{
BMIter iter;
BMLoop *l;
- float v1[3], v2[3], v3[3]/*, v4[3 */, no[3], mid[3], *p1, *p2, *p3, *p4;
+ float v1[3], v2[3], v3[3] /*, v4[3 */, no[3], mid[3], *p1, *p2, *p3, *p4;
float out[3] = {-234324.0f, -234324.0f, 0.0f};
float (*projverts)[3];
float (*edgeverts)[3];
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2012-03-28 00:42:38 UTC (rev 45224)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c 2012-03-28 01:06:43 UTC (rev 45225)
@@ -160,11 +160,18 @@
char *warnpackedfile;
char *warnmultifile;
- /* texture paint only */
+ /* viewport texture paint only, but _not_ project paint */
Object *ob;
- Mesh *me;
int faceindex;
float uv[2];
+ int do_facesel;
+
+ DerivedMesh *dm;
+ int dm_totface;
+ int dm_release;
+
+ MFace *dm_mface;
+ MTFace *dm_mtface;
} ImagePaintState;
typedef struct ImagePaintPartialRedraw {
@@ -525,11 +532,11 @@
Image *ima;
if (scene_use_new_shading_nodes(s->scene)) {
- MFace *mf = s->me->mface+face_index;
+ MFace *mf = &s->dm_mface[face_index];
ED_object_get_active_image(s->ob, mf->mat_nr, &ima, NULL, NULL);
}
else {
- MTFace *tf = s->me->mtface+face_index;
+ MTFace *tf = &s->dm_mtface[face_index];
ima = tf->tpage;
}
@@ -4540,9 +4547,9 @@
if (texpaint) {
/* pick new face and image */
- if ( imapaint_pick_face(vc, s->me, mval, &newfaceindex) &&
- ((s->me->editflag & ME_EDIT_PAINT_MASK)==0 || (s->me->mface+newfaceindex)->flag & ME_FACE_SEL)
- ) {
+ if (imapaint_pick_face(vc, mval, &newfaceindex, s->dm_totface) &&
+ ((s->do_facesel == FALSE) || (s->dm_mface[newfaceindex].flag & ME_FACE_SEL)))
+ {
ImBuf *ibuf;
newimage = imapaint_face_image(s, newfaceindex);
@@ -4853,9 +4860,39 @@
pop->orig_brush_size= brush_size(scene, brush);
if (pop->mode != PAINT_MODE_2D) {
- pop->s.ob = OBACT;
- pop->s.me = get_mesh(pop->s.ob);
- if (!pop->s.me) return 0;
+ Object *ob = OBACT;
+ Mesh *me = get_mesh(ob);
+
+ if (!me) {
+ return 0;
+ }
+
+ pop->s.ob = ob;
+ pop->s.do_facesel = (me->editflag & ME_EDIT_PAINT_MASK) != 0;
+
+ /* for non prohect paint we need */
+ /* fill in derived mesh */
+ if (ob->derivedFinal && CustomData_has_layer( &ob->derivedFinal->faceData, CD_MTFACE)) {
+ pop->s.dm = ob->derivedFinal;
+ pop->s.dm_release = FALSE;
+ }
+ else {
+ pop->s.dm = mesh_get_derived_final(pop->s.scene, ob, pop->s.scene->customdata_mask | CD_MASK_MTFACE);
+ pop->s.dm_release = TRUE;
+ }
+
+ if (!CustomData_has_layer(&pop->s.dm->faceData, CD_MTFACE)) {
+
+ if (pop->s.dm_release)
+ pop->s.dm->release(pop->s.dm);
+
+ pop->s.dm = NULL;
+ return 0;
+ }
+
+ pop->s.dm_mface = pop->s.dm->getTessFaceArray(pop->s.dm);
+ pop->s.dm_mtface= pop->s.dm->getTessFaceDataArray(pop->s.dm, CD_MTFACE);
+ pop->s.dm_totface = pop->s.dm->getNumTessFaces(pop->s.dm);
}
else {
pop->s.image = pop->s.sima->image;
@@ -4976,6 +5013,11 @@
project_paint_end(&pop->ps);
}
+ else {
+ /* non projection 3d paint, could move into own function of more needs adding */
+ if (pop->s.dm_release)
+ pop->s.dm->release(pop->s.dm);
+ }
paint_redraw(C, &pop->s, pop->mode == PAINT_MODE_3D, 1);
undo_paint_push_end(UNDO_PAINT_IMAGE);
Modified: trunk/blender/source/blender/imbuf/intern/tiff.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/tiff.c 2012-03-28 00:42:38 UTC (rev 45224)
+++ trunk/blender/source/blender/imbuf/intern/tiff.c 2012-03-28 01:06:43 UTC (rev 45225)
@@ -85,7 +85,7 @@
toff_t offset; /* Current offset within the file. */
tsize_t size; /* Size of the TIFF file. */
} ImbTIFFMemFile;
-#define IMB_TIFF_GET_MEMFILE(x) ((ImbTIFFMemFile*)(x));
+#define IMB_TIFF_GET_MEMFILE(x) ((ImbTIFFMemFile*)(x))
Modified: trunk/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_space_types.h 2012-03-28 00:42:38 UTC (rev 45224)
+++ trunk/blender/source/blender/makesdna/DNA_space_types.h 2012-03-28 01:06:43 UTC (rev 45225)
@@ -348,7 +348,7 @@
char scriptname[1024]; /* 1024 = FILE_MAX */
char scriptarg[256]; /* 1024 = FILE_MAX */
} Script;
-#define SCRIPT_SET_NULL(_script) _script->py_draw = _script->py_event = _script->py_button = _script->py_browsercallback = _script->py_globaldict = NULL; _script->flags = 0;
+#define SCRIPT_SET_NULL(_script) _script->py_draw = _script->py_event = _script->py_button = _script->py_browsercallback = _script->py_globaldict = NULL; _script->flags = 0
typedef struct SpaceScript {
SpaceLink *next, *prev;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_explode.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_explode.c 2012-03-28 00:42:38 UTC (rev 45224)
+++ trunk/blender/source/blender/modifiers/intern/MOD_explode.c 2012-03-28 01:06:43 UTC (rev 45225)
@@ -210,8 +210,8 @@
v[2]=mf->v##c; uv[2]=c-1; \
v[3]=mf->v##d; uv[3]=d-1;
-#define GET_ES(v1, v2) edgecut_get(eh, v1, v2);
-#define INT_UV(uvf, c0, c1) interp_v2_v2v2(uvf, mf->uv[c0], mf->uv[c1], 0.5f);
+#define GET_ES(v1, v2) edgecut_get(eh, v1, v2)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list