Merge with trunk up to r38584.
authorJoerg Mueller <nexyon@gmail.com>
Thu, 21 Jul 2011 21:11:58 +0000 (21:11 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Thu, 21 Jul 2011 21:11:58 +0000 (21:11 +0000)
15 files changed:
1  2 
intern/audaspace/CMakeLists.txt
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/sound.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/CMakeLists.txt
source/blender/editors/space_outliner/CMakeLists.txt
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_constraint.c
source/blender/windowmanager/intern/wm_files.c
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/SConscript

Simple merge
@@@ -96,8 -88,11 +93,10 @@@ void sound_free(struct bSound* sound
  #endif // WITH_AUDASPACE
  }
  
 -
  #ifdef WITH_AUDASPACE
  
+ static int force_device = -1;
  #ifdef WITH_JACK
  static void sound_sync_callback(void* data, int mode, float time)
  {
Simple merge
  
  set(INC
        .
-       ../../../intern/string
+       KXNetwork
+       ../BlenderRoutines
+       ../Converter
+       ../Expressions
+       ../GameLogic
+       ../Network
+       ../Network/LoopBackNetwork
+       ../Physics/common
+       ../Rasterizer
+       ../Rasterizer/RAS_OpenGLRasterizer
+       ../SceneGraph
+       ../../blender
+       ../../blender/blenfont
+       ../../blender/blenkernel
+       ../../blender/blenlib
+       ../../blender/blenloader
+       ../../blender/gpu
+       ../../blender/imbuf
+       ../../blender/makesdna
+       ../../blender/python
+       ../../blender/python/generic
+       ../../blender/python/mathutils
+       ../../../intern/container
        ../../../intern/guardedalloc
 +      ../../../intern/container
 +      ../../../source/gameengine/Rasterizer/RAS_OpenGLRasterizer
 +      ../../../source/gameengine/Converter
 +      ../../../source/gameengine/BlenderRoutines
 +      ../../../source/blender/imbuf
        ../../../intern/moto/include
+       ../../../intern/string
 +      ../../../source/gameengine/Ketsji
 +      ../../../source/blender/blenlib
 +      ../../../source/blender/blenfont
 +      ../../../source/blender/blenkernel
 +      ../../../source/blender/python
 +      ../../../source/blender/python/generic
 +      ../../../source/blender
 +      ../../../source/blender/makesdna
 +      ../../../source/blender/makesrna
 +      ../../../source/gameengine/Rasterizer
 +      ../../../source/gameengine/GameLogic
 +      ../../../source/gameengine/Expressions
 +      ../../../source/gameengine/Ketsji/KXNetwork
 +      ../../../source/gameengine/Network
 +      ../../../source/gameengine/SceneGraph
 +      ../../../source/gameengine/Physics/common
 +      ../../../source/gameengine/Network/LoopBackNetwork
 +      ../../../source/blender/blenloader
 +      ../../../source/blender/gpu
  )
  
  set(INC_SYS
@@@ -131,8 -128,10 +154,12 @@@ set(SR
        KX_WorldInfo.cpp
        KX_WorldIpoController.cpp
  
 +      BL_Action.h
 +      BL_ActionManager.h
+       BL_BlenderShader.h
+       BL_Material.h
+       BL_Shader.h
+       BL_Texture.h
        KX_ArmatureSensor.h
        KX_BlenderMaterial.h
        KX_BulletPhysicsController.h
Simple merge