[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49874] trunk/blender/source/blender: fix for error in last commit + some more <pre>'s
Campbell Barton
ideasman42 at gmail.com
Mon Aug 13 17:34:04 CEST 2012
Revision: 49874
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49874
Author: campbellbarton
Date: 2012-08-13 15:34:04 +0000 (Mon, 13 Aug 2012)
Log Message:
-----------
fix for error in last commit + some more <pre>'s
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
trunk/blender/source/blender/makesdna/DNA_object_types.h
trunk/blender/source/blender/render/intern/source/pixelblending.c
Modified: trunk/blender/source/blender/bmesh/intern/bmesh_construct.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-08-13 15:17:15 UTC (rev 49873)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_construct.c 2012-08-13 15:34:04 UTC (rev 49874)
@@ -540,7 +540,7 @@
}
/**
-/* you need to make remove tagged verts/edges/faces
+ * you need to make remove tagged verts/edges/faces
* api functions that take a filter callback.....
* and this new filter type will be for opstack flags.
* This is because the BM_remove_taggedXXX functions bypass iterator API.
Modified: trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-08-13 15:17:15 UTC (rev 49873)
+++ trunk/blender/source/blender/bmesh/operators/bmo_subdivide.c 2012-08-13 15:34:04 UTC (rev 49874)
@@ -269,13 +269,15 @@
* match the input geometry. they're based on the
* pre-split state of the face */
-/*
+/**
+ * <pre>
* v3---------v2
* | |
* | |
* | |
* | |
* v4---v0---v1
+ * </pre>
*/
static void quad_1edge_split(BMesh *bm, BMFace *UNUSED(face),
BMVert **verts, const SubDParams *params)
@@ -313,13 +315,15 @@
};
-/*
+/**
+ * <pre>
* v6--------v5
* | |
* | |v4s
* | |v3s
* | s s |
* v7-v0--v1-v2
+ * </pre>
*/
static void quad_2edge_split_path(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
const SubDParams *params)
@@ -339,13 +343,15 @@
4,
};
-/*
+/**
+ * <pre>
* v6--------v5
* | |
* | |v4s
* | |v3s
* | s s |
* v7-v0--v1-v2
+ * </pre>
*/
static void quad_2edge_split_innervert(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
const SubDParams *params)
@@ -379,14 +385,15 @@
4,
};
-/*
+/**
+ * <pre>
* v6--------v5
* | |
* | |v4s
* | |v3s
* | s s |
* v7-v0--v1-v2
- *
+ * </pre>
*/
static void quad_2edge_split_fan(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
const SubDParams *params)
@@ -409,7 +416,8 @@
4,
};
-/*
+/**
+ * <pre>
* s s
* v8--v7--v6-v5
* | |
@@ -418,6 +426,7 @@
* | v3 s
* | s s |
* v9-v0--v1-v2
+ * </pre>
*/
static void quad_3edge_split(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
const SubDParams *params)
@@ -446,7 +455,8 @@
4,
};
-/*
+/**
+ * <pre>
* v8--v7-v6--v5
* | s |
* |v9 s s|v4
@@ -455,6 +465,7 @@
* v11-v0--v1-v2
*
* it goes from bottom up
+ * </pre>
*/
static void quad_4edge_subdivide(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
const SubDParams *params)
@@ -525,7 +536,8 @@
MEM_freeN(lines);
}
-/*
+/**
+ * <pre>
* v3
* / \
* / \
@@ -534,6 +546,7 @@
* / \
* v4--v0--v1--v2
* s s
+ * </pre>
*/
static void tri_1edge_split(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
const SubDParams *params)
@@ -552,7 +565,9 @@
3,
};
-/* v5
+/**
+ * <pre>
+ * v5
* / \
* s v6/---\ v4 s
* / \ / \
@@ -560,6 +575,7 @@
* / \/ \/ \
* v8--v0--v1--v2
* s s
+ * </pre>
*/
static void tri_3edge_subdivide(BMesh *bm, BMFace *UNUSED(face), BMVert **verts,
const SubDParams *params)
@@ -610,7 +626,8 @@
}
}
- /*
+ /**
+ * <pre>
* v5
* / \
* s v6/---\ v4 s
@@ -619,6 +636,7 @@
* / \/ \/ \
* v8--v0--v1--v2
* s s
+ * </pre>
*/
for (i = 1; i < numcuts + 1; i++) {
for (j = 0; j < i; j++) {
Modified: trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp 2012-08-13 15:17:15 UTC (rev 49873)
+++ trunk/blender/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.cpp 2012-08-13 15:34:04 UTC (rev 49874)
@@ -80,10 +80,10 @@
newInput.xmax = input->xmax + this->m_kr2 + 2;
}
else {
- newInput.xmin = input->xmin - 7; /* (0.25f * 20 * 1) + 2 == worse case dispersion */
+ newInput.xmin = input->xmin - 70; /* (0.25f * 20 * 1) + 2 == worse case dispersion */
newInput.ymin = input->ymin;
newInput.ymax = input->ymax;
- newInput.xmax = input->xmax + 7; /* (0.25f * 20 * 1) + 2 == worse case dispersion */
+ newInput.xmax = input->xmax + 70; /* (0.25f * 20 * 1) + 2 == worse case dispersion */
}
return NodeOperation::determineDependingAreaOfInterest(&newInput, readOperation, output);
}
Modified: trunk/blender/source/blender/makesdna/DNA_object_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_object_types.h 2012-08-13 15:17:15 UTC (rev 49873)
+++ trunk/blender/source/blender/makesdna/DNA_object_types.h 2012-08-13 15:34:04 UTC (rev 49874)
@@ -71,16 +71,17 @@
#define DG_LOCK_WEIGHT 1
/**
- * The following illustrates the orientation of the
+ * The following illustrates the orientation of the
* bounding box in local space
- *
- *
+ *
+ * <pre>
+ *
* Z Y
* | /
* |/
* .-----X
- *
- *
+ *
+ *
* 2----------6
* /| /|
* / | / |
@@ -90,6 +91,7 @@
* | / | /
* |/ |/
* 0----------4
+ * </pre>
*/
typedef struct BoundBox {
float vec[8][3];
Modified: trunk/blender/source/blender/render/intern/source/pixelblending.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/pixelblending.c 2012-08-13 15:17:15 UTC (rev 49873)
+++ trunk/blender/source/blender/render/intern/source/pixelblending.c 2012-08-13 15:34:04 UTC (rev 49874)
@@ -233,6 +233,7 @@
/**
* Index ordering, scanline based:
*
+ * <pre>
* --- --- ---
* | 2,0 | 2,1 | 2,2 |
* --- --- ---
@@ -240,6 +241,7 @@
* --- --- ---
* | 0,0 | 0,1 | 0,2 |
* --- --- ---
+ * </pre>
*/
void add_filt_fmask_coord(float filt[][3], const float col[4], float *rowbuf, int row_w, int col_h, int x, int y)
More information about the Bf-blender-cvs
mailing list