Revision: 41757
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41757
Author: campbellbarton
Date: 2011-11-11 13:09:14 +0000 (Fri, 11 Nov 2011)
Log Message:
-----------
correct indentation and some whitespace edits (no functional changes)
Modified Paths:
--------------
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
trunk/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp
trunk/blender/intern/boolop/intern/BOP_Interface.cpp
trunk/blender/intern/boolop/intern/BOP_Mesh.cpp
trunk/blender/intern/bsp/intern/CSG_BooleanOps.cpp
trunk/blender/intern/container/CTR_UHeap.h
trunk/blender/intern/decimation/intern/LOD_QSDecimator.cpp
trunk/blender/intern/ghost/GHOST_ISystem.h
trunk/blender/intern/ghost/GHOST_ISystemPaths.h
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
trunk/blender/intern/ghost/intern/GHOST_System.h
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
trunk/blender/intern/ghost/intern/GHOST_SystemPaths.h
trunk/blender/intern/ghost/intern/GHOST_SystemPathsCocoa.h
trunk/blender/intern/ghost/intern/GHOST_SystemPathsWin32.h
trunk/blender/intern/ghost/intern/GHOST_SystemPathsX11.h
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.h
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
trunk/blender/intern/ghost/test/gears/GHOST_Test.cpp
trunk/blender/intern/memutil/MEM_CacheLimiter.h
trunk/blender/release/plugins/sequence/dnr.c
trunk/blender/release/plugins/sequence/gamma.c
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
trunk/blender/source/blender/blenkernel/BKE_bmfont.h
trunk/blender/source/blender/blenkernel/BKE_fluidsim.h
trunk/blender/source/blender/blenkernel/BKE_mesh.h
trunk/blender/source/blender/blenkernel/BKE_paint.h
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/blenkernel/intern/brush.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/mball.c
trunk/blender/source/blender/blenkernel/intern/multires.c
trunk/blender/source/blender/blenkernel/intern/node.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/softbody.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenlib/BLI_fnmatch.h
trunk/blender/source/blender/blenlib/BLI_pbvh.h
trunk/blender/source/blender/blenlib/BLI_vfontdata.h
trunk/blender/source/blender/blenlib/intern/BLI_heap.c
trunk/blender/source/blender/blenlib/intern/edgehash.c
trunk/blender/source/blender/blenlib/intern/pbvh.c
trunk/blender/source/blender/blenlib/intern/scanfill.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/ArmatureExporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.h
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/editarmature_retarget.c
trunk/blender/source/blender/editors/curve/curve_intern.h
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/include/ED_sculpt.h
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/mesh/editmesh_lib.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/mesh/mesh_data.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/object/object_hook.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_file/file_draw.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_ops.c
trunk/blender/source/blender/editors/space_text/text_intern.h
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_orientations.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/gpu/intern/gpu_codegen.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/gpu/intern/gpu_extensions.c
trunk/blender/source/blender/imbuf/IMB_imbuf.h
trunk/blender/source/blender/imbuf/intern/IMB_indexer.h
trunk/blender/source/blender/imbuf/intern/anim_movie.c
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/imbuf/intern/jpeg.c
trunk/blender/source/blender/imbuf/intern/png.c
trunk/blender/source/blender/imbuf/intern/scaling.c
trunk/blender/source/blender/imbuf/intern/thumbs_blend.c
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesdna/DNA_object_force.h
trunk/blender/source/blender/makesdna/DNA_sensor_types.h
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_lamp.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_meta.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/modifiers/intern/MOD_armature.c
trunk/blender/source/blender/modifiers/intern/MOD_array.c
trunk/blender/source/blender/modifiers/intern/MOD_boolean.c
trunk/blender/source/blender/modifiers/intern/MOD_curve.c
trunk/blender/source/blender/modifiers/intern/MOD_displace.c
trunk/blender/source/blender/modifiers/intern/MOD_hook.c
trunk/blender/source/blender/modifiers/intern/MOD_lattice.c
trunk/blender/source/blender/modifiers/intern/MOD_mirror.c
trunk/blender/source/blender/modifiers/intern/MOD_smooth.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
trunk/blender/source/blender/python/generic/noise_py_api.c
trunk/blender/source/blender/quicktime/apple/qtkit_import.m
trunk/blender/source/blender/quicktime/apple/quicktime_export.c
trunk/blender/source/blender/quicktime/apple/quicktime_import.c
trunk/blender/source/blender/render/extern/include/RE_pipeline.h
trunk/blender/source/blender/render/intern/source/imagetexture.c
trunk/blender/source/blender/render/intern/source/occlusion.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/render/intern/source/render_texture.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
trunk/blender/source/gameengine/Expressions/IntValue.h
trunk/blender/source/gameengine/GameLogic/SCA_MouseSensor.h
trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
trunk/blender/source/gameengine/Ketsji/BL_Action.cpp
trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp
trunk/blender/source/gameengine/Ketsji/KX_IpoActuator.h
trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.h
trunk/blender/source/gameengine/Ketsji/KX_NearSensor.h
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
trunk/blender/source/gameengine/VideoTexture/Texture.h
Modified: trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2011-11-11
12:00:08 UTC (rev 41756)
+++ trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2011-11-11
13:09:14 UTC (rev 41757)
@@ -395,7 +395,7 @@
{
data_size = AUD_MIN(pkgbuf_pos, left * sample_size);
m_convert((data_t*) buf, (data_t*) m_pkgbuf.getBuffer(),
- data_size / AUD_FORMAT_SIZE(m_specs.format));
+ data_size / AUD_FORMAT_SIZE(m_specs.format));
buf += data_size / AUD_FORMAT_SIZE(m_specs.format);
left -= data_size/sample_size;
}
Modified: trunk/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
2011-11-11 12:00:08 UTC (rev 41756)
+++ trunk/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
2011-11-11 13:09:14 UTC (rev 41757)
@@ -73,5 +73,5 @@
m_reader->read(length, eos, m_buffer.getBuffer());
m_convert((data_t*)buffer, (data_t*)m_buffer.getBuffer(),
- length * specs.channels);
+ length * specs.channels);
}
Modified: trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp 2011-11-11
12:00:08 UTC (rev 41756)
+++ trunk/blender/intern/boolop/intern/BOP_Face2Face.cpp 2011-11-11
13:09:14 UTC (rev 41757)
@@ -167,39 +167,41 @@
MT_Point3 p2 = mesh->getVertex(faceA->getVertex(1))->getPoint();
MT_Point3 p3 = mesh->getVertex(faceA->getVertex(2))->getPoint();
- /* get (or create) bounding box for face A */
+ /* get (or create) bounding box for face A */
if( faceA->getBBox() == NULL )
- faceA->setBBox(p1,p2,p3);
+ faceA->setBBox(p1,p2,p3);
BOP_BBox *boxA = faceA->getBBox();
/* start checking B faces with the previously stored split index */
for(unsigned int idxFaceB=faceA->getSplit();
- idxFaceB<facesB->size() && (faceA->getTAG() != BROKEN)
&& (faceA->getTAG() != PHANTOM);) {
+ idxFaceB<facesB->size() && (faceA->getTAG() != BROKEN) &&
(faceA->getTAG() != PHANTOM);) {
BOP_Face *faceB = (*facesB)[idxFaceB];
faceA->setSplit(idxFaceB);
if ((faceB->getTAG() != BROKEN) && (faceB->getTAG() !=
PHANTOM)) {
- /* get (or create) bounding box for face B */
- if( faceB->getBBox() == NULL )
-
faceB->setBBox(mesh->getVertex(faceB->getVertex(0))->getPoint(),
- mesh->getVertex(faceB->getVertex(1))->getPoint(),
- mesh->getVertex(faceB->getVertex(2))->getPoint());
- BOP_BBox *boxB = faceB->getBBox();
+ /* get (or create) bounding box for face B */
+ if( faceB->getBBox() == NULL ) {
+
faceB->setBBox(mesh->getVertex(faceB->getVertex(0))->getPoint(),
+
mesh->getVertex(faceB->getVertex(1))->getPoint(),
+
mesh->getVertex(faceB->getVertex(2))->getPoint());
+ }
+ BOP_BBox *boxB = faceB->getBBox();
- if (boxA->intersect(*boxB)) {
- MT_Plane3 planeB = faceB->getPlane();
- if (BOP_containsPoint(planeB,p1) &&
- BOP_containsPoint(planeB,p2) &&
- BOP_containsPoint(planeB,p3)) {
- if (BOP_orientation(planeB,planeA)>0) {
-
BOP_intersectCoplanarFaces(mesh,facesB,faceA,faceB,false);
- }
- }
- else {
-
BOP_intersectNonCoplanarFaces(mesh,facesA,facesB,faceA,faceB);
- }
- }
+ if (boxA->intersect(*boxB)) {
+ MT_Plane3 planeB = faceB->getPlane();
+ if (BOP_containsPoint(planeB,p1) &&
+ BOP_containsPoint(planeB,p2) &&
+ BOP_containsPoint(planeB,p3))
+ {
+ if
(BOP_orientation(planeB,planeA)>0) {
+
BOP_intersectCoplanarFaces(mesh,facesB,faceA,faceB,false);
+ }
+ }
+ else {
+
BOP_intersectNonCoplanarFaces(mesh,facesA,facesB,faceA,faceB);
+ }
+ }
}
idxFaceB++;
}
@@ -656,16 +658,16 @@
* @param invert indicates if faceA has priority over faceB
* @param segmemts array of the output x-segments
*/
- void BOP_createXS(BOP_Mesh* mesh,
- BOP_Face* faceA,
- BOP_Face* faceB,
- BOP_Segment sA,
- BOP_Segment sB,
- bool invert,
- BOP_Segment* segments) {
- BOP_createXS(mesh, faceA, faceB, faceA->getPlane(), faceB->getPlane(),
- sA, sB, invert, segments);
- }
+void BOP_createXS(BOP_Mesh* mesh,
+ BOP_Face* faceA,
+ BOP_Face* faceB,
+ BOP_Segment sA,
+ BOP_Segment sB,
+ bool invert,
+ BOP_Segment* segments) {
+ BOP_createXS(mesh, faceA, faceB, faceA->getPlane(), faceB->getPlane(),
+ sA, sB, invert, segments);
+}
/**
* Computes the x-segment of two segments (the shared interval). The segments
needs to have sA.m_cfg1 > 0 && sB.m_cfg1 > 0 .
@@ -1169,7 +1171,7 @@
void BOP_removeOverlappedFaces(BOP_Mesh *mesh, BOP_Faces *facesA, BOP_Faces
*facesB)
{
for(unsigned int i=0;i<facesA->size();i++) {
- BOP_Face *faceI = (*facesA)[i];
+ BOP_Face *faceI = (*facesA)[i];
if (faceI->getTAG()==BROKEN) continue;
bool overlapped = false;
MT_Point3 p1 = mesh->getVertex(faceI->getVertex(0))->getPoint();
@@ -1178,21 +1180,23 @@
for(unsigned int j=0;j<facesB->size();) {
BOP_Face *faceJ = (*facesB)[j];
if (faceJ->getTAG()!=BROKEN) {
- MT_Plane3 planeJ = faceJ->getPlane();
- if (BOP_containsPoint(planeJ,p1) &&
BOP_containsPoint(planeJ,p2)
- && BOP_containsPoint(planeJ,p3)) {
- MT_Point3 q1 =
mesh->getVertex(faceJ->getVertex(0))->getPoint();
- MT_Point3 q2 =
mesh->getVertex(faceJ->getVertex(1))->getPoint();
- MT_Point3 q3 =
mesh->getVertex(faceJ->getVertex(2))->getPoint();
- if
(BOP_overlap(MT_Vector3(planeJ.x(),planeJ.y(),planeJ.z()),
- p1,p2,p3,q1,q2,q3)) {
-
facesB->erase(facesB->begin()+j,facesB->begin()+(j+1));
- faceJ->setTAG(BROKEN);
- overlapped = true;
- }
- else j++;
- }
- else j++;
+ MT_Plane3 planeJ = faceJ->getPlane();
+ if (BOP_containsPoint(planeJ,p1) &&
BOP_containsPoint(planeJ,p2)
+ && BOP_containsPoint(planeJ,p3))
+ {
+ MT_Point3 q1 =
mesh->getVertex(faceJ->getVertex(0))->getPoint();
+ MT_Point3 q2 =
mesh->getVertex(faceJ->getVertex(1))->getPoint();
+ MT_Point3 q3 =
mesh->getVertex(faceJ->getVertex(2))->getPoint();
+ if
(BOP_overlap(MT_Vector3(planeJ.x(),planeJ.y(),planeJ.z()),
+ p1,p2,p3,q1,q2,q3))
+ {
+
facesB->erase(facesB->begin()+j,facesB->begin()+(j+1));
+ faceJ->setTAG(BROKEN);
+ overlapped = true;
+ }
+ else j++;
+ }
+ else j++;
}else j++;
}
if (overlapped) faceI->setTAG(OVERLAPPED);
Modified: trunk/blender/intern/boolop/intern/BOP_Interface.cpp
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_Interface.cpp 2011-11-11
12:00:08 UTC (rev 41756)
+++ trunk/blender/intern/boolop/intern/BOP_Interface.cpp 2011-11-11
13:09:14 UTC (rev 41757)
@@ -46,23 +46,23 @@
#endif
BoolOpState BOP_intersectionBoolOp(BOP_Mesh* meshC,
- BOP_Faces*
facesA,
- BOP_Faces*
facesB,
- bool
invertMeshA,
- bool
invertMeshB);
+ BOP_Faces* facesA,
+ BOP_Faces* facesB,
+ bool invertMeshA,
+ bool invertMeshB);
BOP_Face3* BOP_createFace(BOP_Mesh* mesh,
- BOP_Index vertex1,
- BOP_Index vertex2,
- BOP_Index vertex3,
- BOP_Index origFace);
+ BOP_Index vertex1,
+ BOP_Index vertex2,
+ BOP_Index vertex3,
+ BOP_Index origFace);
void BOP_addMesh(BOP_Mesh* mesh,
- BOP_Faces* meshFacesId,
- CSG_FaceIteratorDescriptor& face_it,
- CSG_VertexIteratorDescriptor& vertex_it,
- bool invert);
+ BOP_Faces* meshFacesId,
+ CSG_FaceIteratorDescriptor& face_it,
+ CSG_VertexIteratorDescriptor& vertex_it,
+ bool invert);
BSP_CSGMesh* BOP_newEmptyMesh();
BSP_CSGMesh* BOP_exportMesh(BOP_Mesh* inputMesh,
- bool
invert);
+ bool invert);
void BOP_meshFilter(BOP_Mesh* meshC, BOP_Faces* faces, BOP_BSPTree* bsp);
void BOP_simplifiedMeshFilter(BOP_Mesh* meshC, BOP_Faces* faces, BOP_BSPTree*
bsp, bool inverted);
void BOP_meshClassify(BOP_Mesh* meshC, BOP_Faces* faces, BOP_BSPTree* bsp);
Modified: trunk/blender/intern/boolop/intern/BOP_Mesh.cpp
===================================================================
--- trunk/blender/intern/boolop/intern/BOP_Mesh.cpp 2011-11-11 12:00:08 UTC
(rev 41756)
+++ trunk/blender/intern/boolop/intern/BOP_Mesh.cpp 2011-11-11 13:09:14 UTC
(rev 41757)
@@ -788,20 +788,20 @@
bool BOP_Mesh::isClosedMesh()
{
- for(unsigned int i=0; i<m_edges.size(); i++) {
- BOP_Edge *edge = m_edges[i];
- BOP_Indexs faces = edge->getFaces();
- unsigned int count = 0;
- const BOP_IT_Indexs facesEnd = faces.end();
- for(BOP_IT_Indexs it =
faces.begin();it!=facesEnd;it++) {
- if (m_faces[*it]->getTAG()!=BROKEN)
- count++;
- }
+ for(unsigned int i=0; i<m_edges.size(); i++) {
+ BOP_Edge *edge = m_edges[i];
+ BOP_Indexs faces = edge->getFaces();
+ unsigned int count = 0;
+ const BOP_IT_Indexs facesEnd = faces.end();
+ for(BOP_IT_Indexs it = faces.begin();it!=facesEnd;it++) {
+ if (m_faces[*it]->getTAG()!=BROKEN)
+ count++;
+ }
- if ((count%2)!=0) return false;
- }
+ if ((count%2)!=0) return false;
+ }
- return true;
+ return true;
}
Modified: trunk/blender/intern/bsp/intern/CSG_BooleanOps.cpp
===================================================================
--- trunk/blender/intern/bsp/intern/CSG_BooleanOps.cpp 2011-11-11 12:00:08 UTC
(rev 41756)
+++ trunk/blender/intern/bsp/intern/CSG_BooleanOps.cpp 2011-11-11 13:09:14 UTC
(rev 41757)
@@ -91,14 +91,14 @@
switch( op_type ) {
case e_csg_union:
- boolType = BOP_UNION;
- break;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
