Revision: 44438
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44438
Author: kjym3
Date: 2012-02-25 21:11:29 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 44436.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44436
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindGLEW.cmake
branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
branches/soc-2008-mxcurioni/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_BSPNode.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Face2Face.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Merge2.h
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Mesh.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Mesh.h
branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_MeshPrimitives.h
branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/BSP_TMesh.h
branches/soc-2008-mxcurioni/intern/cycles/device/device_network.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/nodes/node_texture.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/osl/osl_services.h
branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2008-mxcurioni/source/blender/bmesh/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh.h
branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_operator_api.h
branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_walkers.h
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_inline.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_structure.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_create.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_join_triangles.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_mesh_conv.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_removedoubles.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_triangulate.c
branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2008-mxcurioni/source/blender/bmesh/tools/BME_bevel.c
branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_select.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/knifetool.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/logImageLib.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/divers.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_utils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_noise.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/IntValue.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/ListValue.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Operator1Expr.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Operator2Expr.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/VectorValue.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_FontObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PositionInterpolator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ScalarInterpolator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ScalingInterpolator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkScene.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operator_api_inline.c
Property Changed:
----------------
branches/soc-2008-mxcurioni/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419
+
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-44436
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2012-02-25 20:58:03 UTC (rev
44437)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2012-02-25 21:11:29 UTC (rev
44438)
@@ -1498,7 +1498,7 @@
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if(WITH_IK_ITASC)
- message(WARNING "Using Clang as CXX compiler: disabling
WITH_IK_ITASC and WITH_MOD_FLUID, these features will be missing.")
+ message(WARNING "Using Clang as CXX compiler: disabling
WITH_IK_ITASC, this feature will be missing.")
set(WITH_IK_ITASC OFF)
endif()
endif()
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2012-02-25 20:58:03 UTC (rev
44437)
+++ branches/soc-2008-mxcurioni/SConstruct 2012-02-25 21:11:29 UTC (rev
44438)
@@ -274,7 +274,7 @@
# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for
OSX
if env['OURPLATFORM']=='darwin':
- print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC +
env['XCODE_CUR_VER'][:9] + " --"
+ print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC +
env['XCODE_CUR_VER'] + " --"
print "Available " + env['MACOSX_SDK_CHECK']
if not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
print B.bc.OKGREEN + "MacOSX10.5.sdk not available:" + B.bc.ENDC + "
using MacOSX10.6.sdk"
Modified: branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindGLEW.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindGLEW.cmake
2012-02-25 20:58:03 UTC (rev 44437)
+++ branches/soc-2008-mxcurioni/build_files/cmake/Modules/FindGLEW.cmake
2012-02-25 21:11:29 UTC (rev 44438)
@@ -18,7 +18,7 @@
PATHS
$ENV{PROGRAMFILES}/GLEW/lib
${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
- ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
+ ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
DOC "The GLEW library (64-bit)"
)
ELSE(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
@@ -27,7 +27,7 @@
PATHS
$ENV{PROGRAMFILES}/GLEW/lib
${PROJECT_SOURCE_DIR}/src/nvgl/glew/bin
- ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
+ ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib
DOC "The GLEW library"
)
ENDIF(NV_SYSTEM_PROCESSOR STREQUAL "AMD64")
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
2012-02-25 20:58:03 UTC (rev 44437)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
2012-02-25 21:11:29 UTC (rev 44438)
@@ -34,7 +34,7 @@
MAC_CUR_VER='10.7'
cmd = 'xcodebuild -version'
cmd_xcode=commands.getoutput(cmd)
-XCODE_CUR_VER=cmd_xcode
+XCODE_CUR_VER=cmd_xcode[6:][:3] # truncate output to major.minor version
cmd = 'xcodebuild -showsdks'
cmd_sdk=commands.getoutput(cmd)
MACOSX_SDK_CHECK=cmd_sdk
Modified:
branches/soc-2008-mxcurioni/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
===================================================================
---
branches/soc-2008-mxcurioni/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
2012-02-25 20:58:03 UTC (rev 44437)
+++
branches/soc-2008-mxcurioni/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
2012-02-25 21:11:29 UTC (rev 44438)
@@ -70,7 +70,7 @@
const float cp = vcross2(p1, p2, p3);
if (fabsf(cp) > EPS)
- {
+ {
const float p1Sq = vdot2(p1,p1);
const float p2Sq = vdot2(p2,p2);
const float p3Sq = vdot2(p3,p3);
@@ -78,7 +78,7 @@
c[2] = (p1Sq*(p3[0]-p2[0]) + p2Sq*(p1[0]-p3[0]) +
p3Sq*(p2[0]-p1[0])) / (2*cp);
r = vdist2(c, p1);
return true;
- }
+ }
c[0] = p1[0];
c[2] = p1[2];
Modified: branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_BSPNode.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_BSPNode.cpp
2012-02-25 20:58:03 UTC (rev 44437)
+++ branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_BSPNode.cpp
2012-02-25 21:11:29 UTC (rev 44438)
@@ -89,10 +89,10 @@
else {
m_outChild = new BOP_BSPNode(plane);
newDeep = 2;
- }
+ }
} else { // face lies in both half-spaces: split it
BOP_BSPPoints inside, outside;
- MT_Point3 lpoint= pts[pts.size()-1];
+ MT_Point3 lpoint= pts[pts.size()-1];
BOP_TAG ltag = testPoint(lpoint);
BOP_TAG tstate = ltag;
Modified: branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Face2Face.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Face2Face.cpp
2012-02-25 20:58:03 UTC (rev 44437)
+++ branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Face2Face.cpp
2012-02-25 21:11:29 UTC (rev 44438)
@@ -538,10 +538,10 @@
for(i=0;i<size;i++) {
if (position[i] == 1) {
invertA = true;
- break;
- }
- else if (position[i] == 0) break;
- }
+ break;
+ }
+ else if (position[i] == 0) break;
+ }
// invertBø?
if (size == 4) {
@@ -597,7 +597,7 @@
sortedFaces[i] =
sortedFaces[i+1];
}
size--;
- }
+ }
}
else {
// merge 0 and 1
@@ -616,7 +616,7 @@
size--;
}
}
- }
+ }
}
else {
if (BOP_fuzzyZero(d2) && sortedFaces[1] !=
sortedFaces[2]) {
@@ -637,14 +637,14 @@
}
}
}
-
+
// Merge initial points ...
for(i=0;i<size;i++) {
points[i] = sortedPoints[i];
face[i] = sortedFaces[i];
}
- }
+ }
}
@@ -1058,17 +1058,17 @@
else {
// EDGE(v1) + EDGE(v2)
if (BOP_Segment::getEdge(s.m_cfg1) ==
BOP_Segment::getEdge(s.m_cfg2)) {
- // EDGE(v1) == EDGE(v2)
+ // EDGE(v1) == EDGE(v2)
BOP_Edge *edge =
mesh->getEdge(face,BOP_Segment::getEdge(s.m_cfg1));
- BOP_triangulateD(mesh, faces, face, s.m_v1,
s.m_v2,
-
BOP_Segment::getEdge(s.m_cfg1));
+ BOP_triangulateD(mesh, faces, face, s.m_v1,
s.m_v2,
+
BOP_Segment::getEdge(s.m_cfg1));
BOP_Face *opposite =
BOP_getOppositeFace(mesh,faces,face,edge);
if (opposite != NULL) {
- unsigned int e;
- opposite->getEdgeIndex(edge->getVertex1(),
edge->getVertex2(),e);
- BOP_triangulateD(mesh, faces, opposite,
s.m_v1, s.m_v2, e);
+ unsigned int e;
+
opposite->getEdgeIndex(edge->getVertex1(), edge->getVertex2(),e);
+ BOP_triangulateD(mesh, faces, opposite,
s.m_v1, s.m_v2, e);
}
- }
+ }
else { // EDGE(v1) != EDGE(v2)
BOP_Edge *edge1 =
mesh->getEdge(face,BOP_Segment::getEdge(s.m_cfg1));
BOP_Edge *edge2 =
mesh->getEdge(face,BOP_Segment::getEdge(s.m_cfg2));
Modified: branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Merge2.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Merge2.h
2012-02-25 20:58:03 UTC (rev 44437)
+++ branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Merge2.h
2012-02-25 21:11:29 UTC (rev 44438)
@@ -78,7 +78,7 @@
BOP_Index X, BOP_Index I, BOP_Index P,
BOP_Index N );
BOP_Face *find4Neighbor(BOP_Face *faceI, BOP_Face *faceJ,
BOP_Index X, BOP_Index I, BOP_Index P,
BOP_Index N,
- BOP_Face **faceL, BOP_Index &O);
+ BOP_Face **faceL, BOP_Index &O);
BOP_Face3 *collapse(BOP_Face4 *faceC, BOP_Index X);
void mergeFaces(BOP_Face *A, BOP_Face *B, BOP_Index X,
BOP_Index I, BOP_Index N, BOP_Index P, BOP_Faces
&newFaces );
Modified: branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Mesh.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Mesh.cpp
2012-02-25 20:58:03 UTC (rev 44437)
+++ branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Mesh.cpp
2012-02-25 21:11:29 UTC (rev 44438)
@@ -252,8 +252,8 @@
BOP_Index index2 = face->getVertex(1);
BOP_Index index3 = face->getVertex(2);
- m_faces.push_back((BOP_Face *)face);
-
+ m_faces.push_back((BOP_Face *)face);
+
BOP_Index edge;
if (!getIndexEdge(index1,index2,edge)) {
@@ -261,7 +261,7 @@
getVertex(index1)->addEdge(edge);
getVertex(index2)->addEdge(edge);
}
-
+
getEdge(edge)->addFace(indexface);
if (!getIndexEdge(index2,index3,edge)) {
@@ -269,7 +269,7 @@
getVertex(index2)->addEdge(edge);
getVertex(index3)->addEdge(edge);
}
-
+
getEdge(edge)->addFace(indexface);
if (!getIndexEdge(index3,index1,edge)) {
@@ -277,13 +277,13 @@
getVertex(index3)->addEdge(edge);
getVertex(index1)->addEdge(edge);
}
-
+
getEdge(edge)->addFace(indexface);
if ((index1 == index2) || (index1 == index3) || (index2 == index3))
face->setTAG(BROKEN);
- return indexface;
+ return indexface;
}
/**
@@ -452,7 +452,7 @@
#ifdef HASH_PRINTF_DEBUG
printf ("found edge (%d %d)\n",v1,v2);
#endif
- e = edge->index;
+ e = edge->index;
#ifdef BOP_NEW_MERGE
if( m_edges[e]->getUsed() == false ) {
m_edges[e]->setUsed(true);
Modified: branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Mesh.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Mesh.h 2012-02-25
20:58:03 UTC (rev 44437)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
