Revision: 17158
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17158
Author:   unclezeiv
Date:     2008-10-22 01:41:09 +0200 (Wed, 22 Oct 2008)

Log Message:
-----------
svn merge -r 17095:17157 
https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/soc-2008-unclezeiv/SConstruct
    branches/soc-2008-unclezeiv/config/darwin-config.py
    branches/soc-2008-unclezeiv/config/linux2-config.py
    branches/soc-2008-unclezeiv/config/linuxcross-config.py
    branches/soc-2008-unclezeiv/config/openbsd3-config.py
    branches/soc-2008-unclezeiv/config/sunos5-config.py
    branches/soc-2008-unclezeiv/config/win32-mingw-config.py
    branches/soc-2008-unclezeiv/config/win32-vc-config.py
    
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
    branches/soc-2008-unclezeiv/intern/ghost/SConscript
    branches/soc-2008-unclezeiv/release/scripts/DirectX8Exporter.py
    branches/soc-2008-unclezeiv/release/scripts/export_fbx.py
    branches/soc-2008-unclezeiv/release/scripts/export_obj.py
    branches/soc-2008-unclezeiv/release/scripts/hotkeys.py
    branches/soc-2008-unclezeiv/release/scripts/import_obj.py
    branches/soc-2008-unclezeiv/release/scripts/lightwave_import.py
    branches/soc-2008-unclezeiv/release/scripts/ply_export.py
    branches/soc-2008-unclezeiv/release/scripts/ply_import.py
    branches/soc-2008-unclezeiv/release/scripts/render_save_layers.py
    
branches/soc-2008-unclezeiv/release/scripts/scripttemplate_gamelogic_basic.py
    branches/soc-2008-unclezeiv/release/scripts/uvcalc_lightmap.py
    branches/soc-2008-unclezeiv/release/scripts/wizard_curve2tree.py
    branches/soc-2008-unclezeiv/release/text/BlenderQuickStart.pdf
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2008-unclezeiv/source/blender/blenlib/intern/fileops.c
    branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-unclezeiv/source/blender/python/SConscript
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Armature.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Object.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/Types.c
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Blender.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Ipo.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Render.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Types.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/sceneRender.c
    branches/soc-2008-unclezeiv/source/blender/render/intern/source/sss.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_editing.c
    branches/soc-2008-unclezeiv/source/blender/src/buttons_object.c
    branches/soc-2008-unclezeiv/source/blender/src/drawaction.c
    branches/soc-2008-unclezeiv/source/blender/src/drawgpencil.c
    branches/soc-2008-unclezeiv/source/blender/src/editaction.c
    branches/soc-2008-unclezeiv/source/blender/src/editaction_gpencil.c
    branches/soc-2008-unclezeiv/source/blender/src/editarmature.c
    branches/soc-2008-unclezeiv/source/blender/src/editconstraint.c
    branches/soc-2008-unclezeiv/source/blender/src/editipo.c
    branches/soc-2008-unclezeiv/source/blender/src/editmesh.c
    branches/soc-2008-unclezeiv/source/blender/src/editnla.c
    branches/soc-2008-unclezeiv/source/blender/src/gpencil.c
    branches/soc-2008-unclezeiv/source/blender/src/header_time.c
    branches/soc-2008-unclezeiv/source/blender/src/keyframing.c
    branches/soc-2008-unclezeiv/source/blender/src/outliner.c
    branches/soc-2008-unclezeiv/source/blender/src/poselib.c
    branches/soc-2008-unclezeiv/source/blender/src/space.c
    branches/soc-2008-unclezeiv/source/blender/src/transform.c
    branches/soc-2008-unclezeiv/source/blender/src/transform_conversions.c
    branches/soc-2008-unclezeiv/source/blender/src/view.c
    branches/soc-2008-unclezeiv/source/creator/SConscript
    branches/soc-2008-unclezeiv/source/creator/creator.c
    
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/GameLogic.py
    branches/soc-2008-unclezeiv/tools/Blender.py
    branches/soc-2008-unclezeiv/tools/btools.py

Added Paths:
-----------
    branches/soc-2008-unclezeiv/release/scripts/import_web3d.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/Renderlayer.py
    branches/soc-2008-unclezeiv/source/blender/python/api2_2x/doc/SConscript
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/SCA_JoystickSensor.py
    branches/soc-2008-unclezeiv/source/gameengine/PyDoc/SConscript

Modified: branches/soc-2008-unclezeiv/SConstruct
===================================================================
--- branches/soc-2008-unclezeiv/SConstruct      2008-10-21 23:28:22 UTC (rev 
17157)
+++ branches/soc-2008-unclezeiv/SConstruct      2008-10-21 23:41:09 UTC (rev 
17158)
@@ -277,15 +277,15 @@
     env['WITH_BF_BINRELOC'] = False
     env['BF_BUILDINFO'] = False
     env['BF_NO_ELBEEM'] = True
-    
 
-
 # lastly we check for root_build_dir ( we should not do before, otherwise we 
might do wrong builddir
 #B.root_build_dir = B.arguments.get('BF_BUILDDIR', 
'..'+os.sep+'build'+os.sep+platform+os.sep)
 B.root_build_dir = env['BF_BUILDDIR']
-env['BUILDDIR'] = B.root_build_dir
+B.doc_build_dir = env['BF_DOCDIR']
 if not B.root_build_dir[-1]==os.sep:
     B.root_build_dir += os.sep
+if not B.doc_build_dir[-1]==os.sep:
+    B.doc_build_dir += os.sep
     
 # We do a shortcut for clean when no quicklist is given: just delete
 # builddir without reading in SConscripts
@@ -294,8 +294,18 @@
     do_clean = True
 
 if not quickie and do_clean:
+    if os.path.exists(B.doc_build_dir):
+        print B.bc.HEADER+'Cleaning doc dir...'+B.bc.ENDC
+        dirs = os.listdir(B.doc_build_dir)
+        for entry in dirs:
+            if os.path.isdir(B.doc_build_dir + entry) == 1:
+                print "clean dir %s"%(B.doc_build_dir+entry)
+                shutil.rmtree(B.doc_build_dir+entry)
+            else: # remove file
+                print "remove file %s"%(B.doc_build_dir+entry)
+                os.remove(B.root_build_dir+entry)
     if os.path.exists(B.root_build_dir):
-        print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
+        print B.bc.HEADER+'Cleaning build dir...'+B.bc.ENDC
         dirs = os.listdir(B.root_build_dir)
         for entry in dirs:
             if os.path.isdir(B.root_build_dir + entry) == 1:
@@ -321,6 +331,8 @@
     os.makedirs ( B.root_build_dir + 'extern' )
     os.makedirs ( B.root_build_dir + 'lib' )
     os.makedirs ( B.root_build_dir + 'bin' )
+if not os.path.isdir(B.doc_build_dir):
+    os.makedirs ( B.doc_build_dir )
 
 Help(opts.GenerateHelpText(env))
 
@@ -363,7 +375,8 @@
 thestatlibs, thelibincs = B.setup_staticlibs(env)
 thesyslibs = B.setup_syslibs(env)
 
-env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, 
[], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
+    env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + 
thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
     playerlist = B.create_blender_liblist(env, 'player')
     env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + 
thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 
'blenderplayer')
@@ -534,6 +547,10 @@
 nsiscmd = env.Command('nsisinstaller', None, nsisaction)
 nsisalias = env.Alias('nsis', nsiscmd)
 
+if 'blender' in B.targets:
+       blenderexe= env.Alias('blender', B.program_list)
+       Depends(blenderexe,installtarget)
+
 if env['WITH_BF_PLAYER']:
     blenderplayer = env.Alias('blenderplayer', B.program_list)
     Depends(blenderplayer,installtarget)
@@ -560,5 +577,7 @@
 # TODO: build stubs and link into blenderplayer
 
 #------------ EPYDOC
-# TODO: run epydoc
+if env['WITH_BF_DOCS']:
+    SConscript('source/blender/python/api2_2x/doc/SConscript')
+    SConscript('source/gameengine/PyDoc/SConscript')
 

Modified: branches/soc-2008-unclezeiv/config/darwin-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/darwin-config.py 2008-10-21 23:28:22 UTC 
(rev 17157)
+++ branches/soc-2008-unclezeiv/config/darwin-config.py 2008-10-21 23:41:09 UTC 
(rev 17158)
@@ -268,3 +268,4 @@
 
 BF_BUILDDIR='../build/darwin'
 BF_INSTALLDIR='../install/darwin'
+BF_DOCDIR='../install/doc'

Modified: branches/soc-2008-unclezeiv/config/linux2-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/linux2-config.py 2008-10-21 23:28:22 UTC 
(rev 17157)
+++ branches/soc-2008-unclezeiv/config/linux2-config.py 2008-10-21 23:41:09 UTC 
(rev 17158)
@@ -205,6 +205,7 @@
 
 BF_BUILDDIR = '../build/linux2'
 BF_INSTALLDIR='../install/linux2'
+BF_DOCDIR='../install/doc'
 
 
 #Link against pthread

Modified: branches/soc-2008-unclezeiv/config/linuxcross-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/linuxcross-config.py     2008-10-21 
23:28:22 UTC (rev 17157)
+++ branches/soc-2008-unclezeiv/config/linuxcross-config.py     2008-10-21 
23:41:09 UTC (rev 17158)
@@ -148,3 +148,4 @@
 
 BF_BUILDDIR = '../build/linuxcross'
 BF_INSTALLDIR='../install/linuxcross'
+BF_DOCDIR='../install/doc'

Modified: branches/soc-2008-unclezeiv/config/openbsd3-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/openbsd3-config.py       2008-10-21 
23:28:22 UTC (rev 17157)
+++ branches/soc-2008-unclezeiv/config/openbsd3-config.py       2008-10-21 
23:41:09 UTC (rev 17158)
@@ -163,3 +163,4 @@
 
 BF_BUILDDIR='../build/openbsd3'
 BF_INSTALLDIR='../install/openbsd3'
+BF_DOCDIR='../install/doc'

Modified: branches/soc-2008-unclezeiv/config/sunos5-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/sunos5-config.py 2008-10-21 23:28:22 UTC 
(rev 17157)
+++ branches/soc-2008-unclezeiv/config/sunos5-config.py 2008-10-21 23:41:09 UTC 
(rev 17158)
@@ -177,6 +177,7 @@
 
 BF_BUILDDIR = '../build/sunos5'
 BF_INSTALLDIR='../install/sunos5'
+BF_DOCDIR='../install/doc'
 
 
 PLATFORM_LINKFLAGS = ['']

Modified: branches/soc-2008-unclezeiv/config/win32-mingw-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/win32-mingw-config.py    2008-10-21 
23:28:22 UTC (rev 17157)
+++ branches/soc-2008-unclezeiv/config/win32-mingw-config.py    2008-10-21 
23:41:09 UTC (rev 17158)
@@ -167,3 +167,4 @@
 
 BF_BUILDDIR = '..\\build\\win32-mingw'
 BF_INSTALLDIR='..\\install\\win32-mingw'
+BF_DOCDIR = '..\\install\\doc'
\ No newline at end of file

Modified: branches/soc-2008-unclezeiv/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-unclezeiv/config/win32-vc-config.py       2008-10-21 
23:28:22 UTC (rev 17157)
+++ branches/soc-2008-unclezeiv/config/win32-vc-config.py       2008-10-21 
23:41:09 UTC (rev 17158)
@@ -187,3 +187,4 @@
 
 BF_BUILDDIR = '..\\build\\win32-vc'
 BF_INSTALLDIR='..\\install\\win32-vc'
+BF_DOCDIR='..\\install\\doc'

Modified: 
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
===================================================================
--- 
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
 2008-10-21 23:28:22 UTC (rev 17157)
+++ 
branches/soc-2008-unclezeiv/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
 2008-10-21 23:41:09 UTC (rev 17158)
@@ -62,6 +62,7 @@
                collisionAlgorithmMaxElementSize = 
btMax(collisionAlgorithmMaxElementSize,maxSize2);
                if (collisionAlgorithmMaxElementSize > curElemSize)
                {
+                       m_collisionAlgorithmPool->~btPoolAllocator();
                        btAlignedFree(m_collisionAlgorithmPool);
                        void* mem = btAlignedAlloc(sizeof(btPoolAllocator),16);
                        m_collisionAlgorithmPool = new(mem) 
btPoolAllocator(collisionAlgorithmMaxElementSize,constructionInfo.m_defaultMaxCollisionAlgorithmPoolSize);

Modified: branches/soc-2008-unclezeiv/intern/ghost/SConscript
===================================================================
--- branches/soc-2008-unclezeiv/intern/ghost/SConscript 2008-10-21 23:28:22 UTC 
(rev 17157)
+++ branches/soc-2008-unclezeiv/intern/ghost/SConscript 2008-10-21 23:41:09 UTC 
(rev 17158)
@@ -10,7 +10,7 @@
 
 pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window']
 
-if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6'):
+if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6', 'irix6'):
     for f in pf:
         sources.remove('intern' + os.sep + f + 'Win32.cpp')
         sources.remove('intern' + os.sep + f + 'Carbon.cpp')

Modified: branches/soc-2008-unclezeiv/release/scripts/DirectX8Exporter.py
===================================================================
--- branches/soc-2008-unclezeiv/release/scripts/DirectX8Exporter.py     
2008-10-21 23:28:22 UTC (rev 17157)
+++ branches/soc-2008-unclezeiv/release/scripts/DirectX8Exporter.py     
2008-10-21 23:41:09 UTC (rev 17158)
@@ -7,7 +7,7 @@
 # Tooltip: 'Export to DirectX text file format format for XNA Animation 
Component Library.'
 """
 __author__ = "vertex color exporting feature is added by mnemoto 
(original:minahito (original:Arben (Ben) Omari))"
-__url__ = ("blender", "elysiun", "Adjuster's site 
http://sunday-lab.blogspot.com/, Author's site 
http://www.omariben.too.it","Adjuster's site http://ex.homeunix.net/";)
+__url__ = ("blender.org", "blenderartists.org", "Adjuster's site 
http://sunday-lab.blogspot.com/, Author's site 
http://www.omariben.too.it","Adjuster's site http://ex.homeunix.net/";)
 __version__ = "3.1"
 
 __bpydoc__ = """\

Modified: branches/soc-2008-unclezeiv/release/scripts/export_fbx.py
===================================================================
--- branches/soc-2008-unclezeiv/release/scripts/export_fbx.py   2008-10-21 
23:28:22 UTC (rev 17157)
+++ branches/soc-2008-unclezeiv/release/scripts/export_fbx.py   2008-10-21 
23:41:09 UTC (rev 17158)
@@ -2887,7 +2887,7 @@
 def write_ui():
        
        # globals
-       GLOBALS['EVENT'] = 2
+       GLOBALS['EVENT'] = EVENT_REDRAW
        #GLOBALS['MOUSE'] = Window.GetMouseCoords()
        GLOBALS['MOUSE'] = [i/2 for i in Window.GetScreenSize()]
        GLOBALS['FILENAME'] = ''
@@ -2929,13 +2929,6 @@
        GLOBALS['_YROT90'] =                                    
Draw.Create(False)
        GLOBALS['_ZROT90'] =                                    
Draw.Create(False)
        
-       # horrible ugly hack so tooltips draw, dosnt always work even
-       # Fixed in Draw.UIBlock for 2.45rc2, but keep this until 2.45 is 
released
-       Window.SetKeyQualifiers(0)
-       while Window.GetMouseButtons(): Blender.sys.sleep(10)
-       for i in xrange(100): Window.QHandle(i)
-       # END HORRID HACK
-       
        # best not do move the cursor
        # Window.SetMouseCoords(*[i/2 for i in Window.GetScreenSize()])
        

Modified: branches/soc-2008-unclezeiv/release/scripts/export_obj.py

@@ Diff output truncated at 10240 characters. @@

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to