[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16096] branches/soc-2008-nicholasbishop: Merge with r16081

Nicholas Bishop nicholasbishop at gmail.com
Thu Aug 14 03:36:59 CEST 2008


Revision: 16096
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16096
Author:   nicholasbishop
Date:     2008-08-14 03:36:55 +0200 (Thu, 14 Aug 2008)

Log Message:
-----------
Merge with r16081

Modified Paths:
--------------
    branches/soc-2008-nicholasbishop/CMakeLists.txt
    branches/soc-2008-nicholasbishop/SConstruct
    branches/soc-2008-nicholasbishop/bin/.blender/.Blanguages
    branches/soc-2008-nicholasbishop/config/linux2-config.py
    branches/soc-2008-nicholasbishop/intern/boolop/SConscript
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Edge.cpp
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Edge.h
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Face.cpp
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Face.h
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Interface.cpp
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Merge.cpp
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Merge.h
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Mesh.cpp
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Mesh.h
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Tag.h
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Vertex.cpp
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Vertex.h
    branches/soc-2008-nicholasbishop/intern/boolop/make/msvc_7_0/boolop.vcproj
    branches/soc-2008-nicholasbishop/intern/bsp/SConscript
    branches/soc-2008-nicholasbishop/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
    branches/soc-2008-nicholasbishop/projectfiles_vc7/blender/blender.sln
    branches/soc-2008-nicholasbishop/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
    branches/soc-2008-nicholasbishop/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/soc-2008-nicholasbishop/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
    branches/soc-2008-nicholasbishop/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
    branches/soc-2008-nicholasbishop/release/scripts/bpymodules/colladaImEx/collada.py
    branches/soc-2008-nicholasbishop/release/scripts/bpymodules/colladaImEx/cstartup.py
    branches/soc-2008-nicholasbishop/release/scripts/bpymodules/colladaImEx/helperObjects.py
    branches/soc-2008-nicholasbishop/release/scripts/bpymodules/colladaImEx/translator.py
    branches/soc-2008-nicholasbishop/release/scripts/bpymodules/colladaImEx/xmlUtils.py
    branches/soc-2008-nicholasbishop/release/scripts/flt_export.py
    branches/soc-2008-nicholasbishop/release/scripts/flt_palettemanager.py
    branches/soc-2008-nicholasbishop/release/scripts/import_dxf.py
    branches/soc-2008-nicholasbishop/release/scripts/ply_export.py
    branches/soc-2008-nicholasbishop/release/scripts/rvk1_torvk2.py
    branches/soc-2008-nicholasbishop/release/scripts/weightpaint_clean.py
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_texture.h
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/collision.c
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/softbody.c
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/texture.c
    branches/soc-2008-nicholasbishop/source/blender/blenlib/BLI_kdopbvh.h
    branches/soc-2008-nicholasbishop/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2008-nicholasbishop/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2008-nicholasbishop/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2008-nicholasbishop/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-nicholasbishop/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-nicholasbishop/source/blender/imbuf/intern/anim.c
    branches/soc-2008-nicholasbishop/source/blender/include/BDR_gpencil.h
    branches/soc-2008-nicholasbishop/source/blender/include/BIF_editarmature.h
    branches/soc-2008-nicholasbishop/source/blender/include/BIF_editmesh.h
    branches/soc-2008-nicholasbishop/source/blender/include/BIF_editview.h
    branches/soc-2008-nicholasbishop/source/blender/include/BIF_poseobject.h
    branches/soc-2008-nicholasbishop/source/blender/include/butspace.h
    branches/soc-2008-nicholasbishop/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2008-nicholasbishop/source/blender/makesdna/DNA_gpencil_types.h
    branches/soc-2008-nicholasbishop/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2008-nicholasbishop/source/blender/python/BPY_interface.c
    branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Blender.c
    branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Constraint.c
    branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Material.c
    branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Mathutils.c
    branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Mathutils.h
    branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Texture.c
    branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/doc/Render.py
    branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/doc/Texture.py
    branches/soc-2008-nicholasbishop/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-nicholasbishop/source/blender/render/intern/source/rayshade.c
    branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
    branches/soc-2008-nicholasbishop/source/blender/src/buttons_logic.c
    branches/soc-2008-nicholasbishop/source/blender/src/buttons_object.c
    branches/soc-2008-nicholasbishop/source/blender/src/buttons_scene.c
    branches/soc-2008-nicholasbishop/source/blender/src/drawgpencil.c
    branches/soc-2008-nicholasbishop/source/blender/src/drawseq.c
    branches/soc-2008-nicholasbishop/source/blender/src/editarmature.c
    branches/soc-2008-nicholasbishop/source/blender/src/editimasel.c
    branches/soc-2008-nicholasbishop/source/blender/src/editipo.c
    branches/soc-2008-nicholasbishop/source/blender/src/editmesh_mods.c
    branches/soc-2008-nicholasbishop/source/blender/src/editobject.c
    branches/soc-2008-nicholasbishop/source/blender/src/editseq.c
    branches/soc-2008-nicholasbishop/source/blender/src/editview.c
    branches/soc-2008-nicholasbishop/source/blender/src/gpencil.c
    branches/soc-2008-nicholasbishop/source/blender/src/header_info.c
    branches/soc-2008-nicholasbishop/source/blender/src/header_ipo.c
    branches/soc-2008-nicholasbishop/source/blender/src/header_view3d.c
    branches/soc-2008-nicholasbishop/source/blender/src/meshlaplacian.c
    branches/soc-2008-nicholasbishop/source/blender/src/outliner.c
    branches/soc-2008-nicholasbishop/source/blender/src/poselib.c
    branches/soc-2008-nicholasbishop/source/blender/src/poseobject.c
    branches/soc-2008-nicholasbishop/source/blender/src/space.c
    branches/soc-2008-nicholasbishop/source/blender/src/toolbox.c
    branches/soc-2008-nicholasbishop/source/blender/src/transform_conversions.c
    branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Expressions/Value.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_EventManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_EventManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_IObject.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_ISensor.h
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_JoystickManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_KeyboardManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_MouseManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_MouseManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_PropertyEventManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_RandomEventManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GameLogic/SCA_TimeEventManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h
    branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_NearSensor.h
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_PythonInit.h
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_RayEventManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_RayEventManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_TouchEventManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Ketsji/SConscript
    branches/soc-2008-nicholasbishop/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
    branches/soc-2008-nicholasbishop/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2008-nicholasbishop/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2008-nicholasbishop/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/soc-2008-nicholasbishop/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
    branches/soc-2008-nicholasbishop/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2008-nicholasbishop/source/gameengine/PyDoc/KX_GameObject.py
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2008-nicholasbishop/source/gameengine/Rasterizer/RAS_Polygon.cpp
    branches/soc-2008-nicholasbishop/tools/btools.py

Added Paths:
-----------
    branches/soc-2008-nicholasbishop/bin/.blender/locale/kr/
    branches/soc-2008-nicholasbishop/bin/.blender/locale/kr/LC_MESSAGES/
    branches/soc-2008-nicholasbishop/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
    branches/soc-2008-nicholasbishop/intern/bmfont/intern/BDF2BMF.py
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Merge2.cpp
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Merge2.h
    branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Misc.h
    branches/soc-2008-nicholasbishop/po/kr.po
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/BKE_bvhutils.h
    branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/bvhutils.c

Removed Paths:
-------------
    branches/soc-2008-nicholasbishop/bin/.blender/locale/kr/LC_MESSAGES/
    branches/soc-2008-nicholasbishop/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
    branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp
    branches/soc-2008-nicholasbishop/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h

Modified: branches/soc-2008-nicholasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2008-nicholasbishop/CMakeLists.txt	2008-08-14 01:14:46 UTC (rev 16095)
+++ branches/soc-2008-nicholasbishop/CMakeLists.txt	2008-08-14 01:36:55 UTC (rev 16096)
@@ -183,9 +183,9 @@
   SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++")
 
   IF(WITH_OPENMP)
-    SET(LLIBS "${LLIBS} -lgomp ")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+    SET(LLIBS "${LLIBS} -lgomp")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
   ENDIF(WITH_OPENMP)
 
 

Modified: branches/soc-2008-nicholasbishop/SConstruct
===================================================================
--- branches/soc-2008-nicholasbishop/SConstruct	2008-08-14 01:14:46 UTC (rev 16095)
+++ branches/soc-2008-nicholasbishop/SConstruct	2008-08-14 01:36:55 UTC (rev 16096)
@@ -184,15 +184,16 @@
                 env['CPPFLAGS'].append('/openmp')
                 env['CXXFLAGS'].append('/openmp')
         else:
-            if env['CC'] == 'icc':
+            if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case
                 env.Append(LINKFLAGS=['-openmp', '-static-intel'])
                 env['CCFLAGS'].append('-openmp')
                 env['CPPFLAGS'].append('-openmp')
                 env['CXXFLAGS'].append('-openmp')
             else:
-                env['CCFLAGS'].append('-fopenmp')
-                env['CPPFLAGS'].append('-fopenmp')
-                env['CXXFLAGS'].append('-fopenmp')
+                env.Append(CCFLAGS=['-fopenmp']) 
+                env.Append(CPPFLAGS=['-fopenmp'])
+                env.Append(CXXFLAGS=['-fopenmp'])
+                # env.Append(LINKFLAGS=['-fprofile-generate'])
 
 #check for additional debug libnames
 

Modified: branches/soc-2008-nicholasbishop/bin/.blender/.Blanguages
===================================================================
--- branches/soc-2008-nicholasbishop/bin/.blender/.Blanguages	2008-08-14 01:14:46 UTC (rev 16095)
+++ branches/soc-2008-nicholasbishop/bin/.blender/.Blanguages	2008-08-14 01:36:55 UTC (rev 16096)
@@ -20,3 +20,4 @@
 Arabic:ar
 Bulgarian:bg
 Greek:el
+Korean:kr

Copied: branches/soc-2008-nicholasbishop/bin/.blender/locale/kr (from rev 16095, trunk/blender/bin/.blender/locale/kr)

Copied: branches/soc-2008-nicholasbishop/bin/.blender/locale/kr/LC_MESSAGES (from rev 16095, trunk/blender/bin/.blender/locale/kr/LC_MESSAGES)

Deleted: branches/soc-2008-nicholasbishop/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)

Copied: branches/soc-2008-nicholasbishop/bin/.blender/locale/kr/LC_MESSAGES/blender.mo (from rev 16095, trunk/blender/bin/.blender/locale/kr/LC_MESSAGES/blender.mo)
===================================================================
(Binary files differ)

Modified: branches/soc-2008-nicholasbishop/config/linux2-config.py
===================================================================
--- branches/soc-2008-nicholasbishop/config/linux2-config.py	2008-08-14 01:14:46 UTC (rev 16095)
+++ branches/soc-2008-nicholasbishop/config/linux2-config.py	2008-08-14 01:36:55 UTC (rev 16096)
@@ -139,7 +139,7 @@
 BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
 BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
 
-WITH_BF_REDCODE = 'true'  
+WITH_BF_REDCODE = 'false'  
 BF_REDCODE = '#extern/libredcode'
 BF_REDCODE_LIB = ''
 # Uncomment the following two lines to use system's ffmpeg

Copied: branches/soc-2008-nicholasbishop/intern/bmfont/intern/BDF2BMF.py (from rev 16095, trunk/blender/intern/bmfont/intern/BDF2BMF.py)
===================================================================
--- branches/soc-2008-nicholasbishop/intern/bmfont/intern/BDF2BMF.py	                        (rev 0)
+++ branches/soc-2008-nicholasbishop/intern/bmfont/intern/BDF2BMF.py	2008-08-14 01:36:55 UTC (rev 16096)
@@ -0,0 +1,177 @@
+#!/usr/bin/python
+
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ***** END GPL LICENCE BLOCK *****
+# --------------------------------------------------------------------------
+
+HELP_TXT = \
+'''
+Convert BDF pixmap fonts into C++ files Blender can read.
+Use to replace bitmap fonts or add new ones.
+
+Usage
+	python bdf2bmf.py -name=SomeName myfile.bdf
+
+Blender currently supports fonts with a maximum width of 8 pixels.
+'''
+
+# -------- Simple BDF parser
+import sys
+def parse_bdf(f, MAX_CHARS=256):
+	lines = [l.strip().upper().split() for l in f.readlines()]
+
+	is_bitmap = False
+	dummy = {'BITMAP':[]}
+	char_data = [dummy.copy() for i in xrange(MAX_CHARS)]
+	context_bitmap = []
+
+	for l in lines:
+		if l[0]=='ENCODING':		enc = int(l[1])
+		elif l[0]=='BBX':			bbx = [int(c) for c in l[1:]]
+		elif l[0]=='DWIDTH':		dwidth = int(l[1])
+		elif l[0]=='BITMAP':		is_bitmap = True
+		elif l[0]=='ENDCHAR':
+			if enc < MAX_CHARS:
+				char_data[enc]['BBX'] = bbx
+				char_data[enc]['DWIDTH'] = dwidth
+				char_data[enc]['BITMAP'] = context_bitmap
+				
+			context_bitmap = []
+			enc = bbx = None
+			is_bitmap = False
+		else:
+			# None of the above, Ok, were reading a bitmap
+			if is_bitmap and enc < MAX_CHARS:
+				context_bitmap.append( int(l[0], 16) )
+	
+	return char_data
+# -------- end simple BDF parser
+
+def bdf2cpp_name(path):
+	return path.split('.')[0] + '.cpp'
+
+def convert_to_blender(bdf_dict, font_name, origfilename, MAX_CHARS=256):
+	
+	# first get a global width/height, also set the offsets
+	xmin = ymin =  10000000
+	xmax = ymax = -10000000
+	
+	bitmap_offsets = [-1] * MAX_CHARS
+	bitmap_tot = 0
+	for i, c in enumerate(bdf_dict):
+		if c.has_key('BBX'):
+			bbx = c['BBX']
+			xmax = max(bbx[0], xmax)
+			ymax = max(bbx[1], ymax)
+			xmin = min(bbx[2], xmin)
+			ymin = min(bbx[3], ymin)
+			
+			bitmap_offsets[i] = bitmap_tot
+			bitmap_tot += len(c['BITMAP'])
+		
+		c['BITMAP'].reverse()
+	
+	# Now we can write. Ok if we have no .'s in the path.
+	f = open(bdf2cpp_name(origfilename), 'w')
+	
+	f.write('''
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "BMF_FontData.h"
+
+#include "BMF_Settings.h"
+''')
+	
+	f.write('#if BMF_INCLUDE_%s\n\n' % font_name.upper())
+	f.write('static unsigned char bitmap_data[]= {')
+	newline = 8
+	
+	for i, c in enumerate(bdf_dict):
+	
+		for cdata in c['BITMAP']:
+			# Just formatting
+			newline+=1
+			if newline >= 8:
+				newline = 0
+				f.write('\n\t')
+			# End formatting
+			
+			f.write('0x%.2hx,' % cdata) # 0x80 <- format
+			
+	f.write("\n};\n")
+	
+	f.write("BMF_FontData BMF_font_%s = {\n" % font_name)
+	f.write('\t%d, %d,\n' % (xmin, ymin))
+	f.write('\t%d, %d,\n' % (xmax, ymax))
+	
+	f.write('\t{\n')
+	
+
+	for i, c in enumerate(bdf_dict):
+		if bitmap_offsets[i] == -1 or c.has_key('BBX') == False:
+			f.write('\t\t{0,0,0,0,0, -1},\n')
+		else:
+			bbx = c['BBX']
+			f.write('\t\t{%d,%d,%d,%d,%d, %d},\n' % (bbx[0], bbx[1], -bbx[2], -bbx[3], c['DWIDTH'], bitmap_offsets[i]))
+	
+	f.write('''
+	},
+	bitmap_data
+};
+
+#endif
+''')
+
+def main():
+	# replace "[-name=foo]" with  "[-name] [foo]"
+	args = []
+	for arg in sys.argv:
+		for a in arg.replace('=', ' ').split():
+			args.append(a)
+	
+	name = 'untitled'
+	done_anything = False
+	for i, arg in enumerate(args):
+		if arg == '-name':
+			if i==len(args)-1:
+				print 'no arg given for -name, aborting'
+				return
+			else:
+				name = args[i+1]
+		
+		elif arg.lower().endswith('.bdf'):
+			try:
+				f = open(arg)
+				print '...Writing to:', bdf2cpp_name(arg)
+			except:
+				print 'could not open "%s", aborting' % arg
+			
+			
+			bdf_dict = parse_bdf(f)
+			convert_to_blender(bdf_dict, name, arg)
+			done_anything = True
+	
+	if not done_anything:
+		print HELP_TXT
+		print '...nothing to do'
+
+if __name__ == '__main__':
+	main()
+	

Modified: branches/soc-2008-nicholasbishop/intern/boolop/SConscript
===================================================================
--- branches/soc-2008-nicholasbishop/intern/boolop/SConscript	2008-08-14 01:14:46 UTC (rev 16095)
+++ branches/soc-2008-nicholasbishop/intern/boolop/SConscript	2008-08-14 01:36:55 UTC (rev 16096)
@@ -8,7 +8,7 @@
 incs += ' ../../source/blender/blenlib'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] )
+    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [30,85] )
 else:
     env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 )
 

Modified: branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Edge.cpp
===================================================================
--- branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Edge.cpp	2008-08-14 01:14:46 UTC (rev 16095)
+++ branches/soc-2008-nicholasbishop/intern/boolop/intern/BOP_Edge.cpp	2008-08-14 01:36:55 UTC (rev 16096)
@@ -75,4 +75,47 @@
 	else if (m_vertexs[1] == oldIndex) m_vertexs[1] = newIndex;
 }
 
+#ifdef BOP_NEW_MERGE
 
+/**
+ * Returns if this edge contains the specified face index.
+ * @param i face index
+ * @return true if this edge contains the specified face index, false otherwise
+ */
+bool BOP_Edge::removeFace(BOP_Index i)
+{
+	int pos=0;
+	for(BOP_IT_Indexs it = m_faces.begin();it!=m_faces.end();pos++,it++) {
+		if ((*it) == i) {
+			m_faces.erase(it);
+			return true;
+		}
+	}
+	
+	return false;
+}
+
+#endif
+
+#ifdef BOP_DEBUG
+
+#include <iostream>
+using namespace std;
+
+/**
+ * Implements operator <<.
+ */
+ostream &operator<<(ostream &stream, BOP_Edge *e)
+{
+	stream << "Edge[" << e->getVertex1() << "," << e->getVertex2();
+#ifdef BOP_NEW_MERGE
+	if(e->m_used)
+		stream << "] (used)";
+	else

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list