svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
authorCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 07:56:42 +0000 (07:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 24 Oct 2011 07:56:42 +0000 (07:56 +0000)
29 files changed:
1  2 
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/fluidsim.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_edgehash.h
source/blender/blenlib/BLI_scanfill.h
source/blender/blenlib/BLI_utildefines.h
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_edgesplit.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp

index 36753fcb02c652822f5af996f80cceb0b3159d67,f9bd76e4ef0cc07b6f895562c77b6b079897d0c8..54906b82584bfc097db460247746042c888ceb1a
  #include "BLI_editVert.h"
  #include "BLI_math.h"
  #include "BLI_memarena.h"
 +#include "BLI_array.h"
  #include "BLI_pbvh.h"
  #include "BLI_utildefines.h"
+ #include "BLI_linklist.h"
  
  #include "BKE_cdderivedmesh.h"
  #include "BKE_displist.h"
index 601c77f8e4383bd6de807fc5b87d2b606aa3aa82,b2bcd9aa6aa70b2cafc52144576b5673c49cbc9c..240a35f419bd7a42db698f8350341812897f336f
@@@ -702,15 -701,6 +702,15 @@@ char *BKE_undo_menu_string(void
  
        /* saves quit.blend */
  void BKE_undo_save_quit(void)
-       BLI_make_file_string("/", str, btempdir, "quit.blend");
 +{
 +      char str[FILE_MAXDIR+FILE_MAXFILE];
 +
++      BLI_make_file_string("/", str, BLI_temporary_dir(), "quit.blend");
 +
 +      BKE_undo_save(str);
 +}
 +
 +void BKE_undo_save(char *fname)
  {
        UndoElem *uel;
        MemFileChunk *chunk;
index a4e8a1fc4bd59a2221f79bf0e3dab12887862c55,79229c49b4d9fb48b5e0bfa333436c3ebf7c91f1..68d653c3cdd847b557b524b5b3af27861770f6c7
  
  #include "BLI_editVert.h"
  #include "BLI_utildefines.h"
+ #include "BLI_linklist.h"
  
  #include "BKE_DerivedMesh.h"
 -
 +#include "BKE_tessmesh.h"
  
  #include "BLI_math.h"
  #include "MEM_guardedalloc.h"
index c8abcc3a594a195ce33c0fa9a4f6050ea7c50eb3,d59a9eed3639358ae2b848abc826a0d084454cf0..daadb4cad207559e13c19764880e7c0a7c76bed7
@@@ -46,9 -46,7 +46,8 @@@
  #include "DNA_meshdata_types.h"
  #include "DNA_ID.h"
  
 +#include "BLI_utildefines.h"
  #include "BLI_blenlib.h"
- #include "BLI_path_util.h"
  #include "BLI_linklist.h"
  #include "BLI_math.h"
  #include "BLI_mempool.h"
index e8b76c214dcc450f7faddd57f2002eb8c15bad92,8a83dcac765ce1f0bbffc25f878383cc440aedf7..7cf1636d650f7f2d4abfb0d420bfcb3278351450
@@@ -54,8 -54,7 +54,9 @@@
  #include "BLI_kdtree.h"
  #include "BLI_rand.h"
  #include "BLI_threads.h"
+ #include "BLI_linklist.h"
 +#include "BLI_cellalloc.h"
 +#include "BLI_math.h"
  
  #include "BKE_anim.h"
  #include "BKE_animsys.h"
index 668502382845d7767012ff07085a2f3b40f0f182,cebefe814954bab0d21b046b34b1f535316a8348..df29934e9d62d8414c12cdfb11b03bed7120b17a
  #include "BLI_blenlib.h"
  #include "BLI_kdtree.h"
  #include "BLI_kdopbvh.h"
- #include "BLI_listbase.h"
  #include "BLI_threads.h"
- #include "BLI_storage.h" /* For _LARGEFILE64_SOURCE;  zlib needs this on some systems */
  #include "BLI_utildefines.h"
+ #include "BLI_linklist.h"
 +#include "BLI_edgehash.h"
  
  #include "BKE_main.h"
  #include "BKE_animsys.h"
Simple merge
Simple merge
Simple merge
Simple merge
index 519117842f87080acc5b333469fc17cfef28f2ad,e9a341896e6673597b4fc78bd5f4fc13c4eaa3fb..5cb2eefa86bfbf6b1b863bbfcb40c68c22ff0a30
  #include "BLI_memarena.h"
  #include "BLI_edgehash.h"
  #include "BLI_math.h"
 -#include "BLI_utildefines.h"
 +#include "BLI_array.h"
 +#include "BLI_smallhash.h"
+ #include "BLI_linklist.h"
  
 -
  #include "BKE_cdderivedmesh.h"
  #include "BKE_modifier.h"
  #include "BKE_particle.h"
index 4639e2a0514a8145d7d66acfba975b00ba865e74,f35499e27d6e3094d0fd985c5a9a514da1753d7c..6f50ef2631ef8fbed268fec180906fde24a44594
  #include "BKE_material.h" /* clear_matcopybuf */
  
  #include "BLI_blenlib.h"
 +#include "BLI_cellalloc.h"
  #include "BLI_winstuff.h"
  
+ #include "RE_engine.h"
  #include "RE_pipeline.h"              /* RE_ free stuff */
  
  #ifdef WITH_PYTHON
Simple merge