Merging trunk up to r39637.
authorJoerg Mueller <nexyon@gmail.com>
Mon, 22 Aug 2011 20:31:46 +0000 (20:31 +0000)
committerJoerg Mueller <nexyon@gmail.com>
Mon, 22 Aug 2011 20:31:46 +0000 (20:31 +0000)
26 files changed:
1  2 
CMakeLists.txt
release/scripts/startup/bl_operators/nla.py
release/scripts/startup/bl_operators/object.py
release/scripts/startup/bl_ui/__init__.py
release/scripts/startup/bl_ui/space_dopesheet.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_userpref.py
source/blender/blenkernel/intern/anim.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/collada/CMakeLists.txt
source/blender/collada/DocumentExporter.cpp
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/object/object_add.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_outliner/outliner_intern.h
source/blender/editors/space_outliner/outliner_select.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_sequencer.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.cpp

diff --cc CMakeLists.txt
@@@ -687,15 -706,15 +706,15 @@@ elseif(WIN32
  
                if(WITH_CODEC_FFMPEG)
                        set(FFMPEG_INCLUDE_DIRS
 -                              ${LIBDIR}/ffmpeg/include
 -                              ${LIBDIR}/ffmpeg/include/msvc
 +                              ${LIBDIR}/ffmpeg-0.8/include
 +                              ${LIBDIR}/ffmpeg-0.8/include/msvc
                        )
                        set(FFMPEG_LIBRARIES
-                               ${LIBDIR}/ffmpeg-0.8/lib/avcodec-53.lib
-                               ${LIBDIR}/ffmpeg-0.8/lib/avformat-53.lib
-                               ${LIBDIR}/ffmpeg-0.8/lib/avdevice-53.lib
-                               ${LIBDIR}/ffmpeg-0.8/lib/avutil-51.lib
-                               ${LIBDIR}/ffmpeg-0.8/lib/swscale-2.lib
+                               ${LIBDIR}/ffmpeg/lib/avcodec-53.lib
+                               ${LIBDIR}/ffmpeg/lib/avformat-53.lib
+                               ${LIBDIR}/ffmpeg/lib/avdevice-53.lib
+                               ${LIBDIR}/ffmpeg/lib/avutil-51.lib
+                               ${LIBDIR}/ffmpeg/lib/swscale-2.lib
                        )
                endif()
  
Simple merge
@@@ -235,10 -233,8 +235,9 @@@ extern "C" void StartKetsjiShell(struc
                ketsjiengine->SetCanvas(canvas);
                ketsjiengine->SetRenderTools(rendertools);
                ketsjiengine->SetRasterizer(rasterizer);
-               ketsjiengine->SetNetworkDevice(networkdevice);
                ketsjiengine->SetUseFixedTime(usefixed);
                ketsjiengine->SetTimingDisplay(frameRate, profile, properties);
 +              ketsjiengine->SetRestrictAnimationFPS(restrictAnimFPS);
  
  #ifdef WITH_PYTHON
                CValue::SetDeprecationWarnings(nodepwarnings);