svn merge -r39057:39286 https://svn.blender.org/svnroot/bf-blender/trunk/blender

diff --cc intern/ghost/intern/GHOST_SystemSDL.cpp
index 918b37dd905be3289a24fe8e7a945530ad3d81c1,aebb94d5cdf169008ea99d7312fdd63a7a2f62b7..6f6679b8d8c02ff8339b00b8f0a3749e9d5fd927
mode 100644,100644..100755
--- 1/intern/ghost/intern/GHOST_SystemSDL.cpp
--- 2/intern/ghost/intern/GHOST_SystemSDL.cpp
+++ b/intern/ghost/intern/GHOST_SystemSDL.cpp

diff --cc release/scripts/startup/bl_ui/space_info.py
Simple merge

diff --cc release/scripts/startup/bl_ui/space_view3d.py
Simple merge

diff --cc source/blender/blenkernel/BKE_blender.h
Simple merge

diff --cc source/blender/blenkernel/intern/blender.c
Simple merge

diff --cc source/blender/blenkernel/intern/particle.c
Simple merge

diff --cc source/blender/blenloader/intern/readfile.c
Simple merge

diff --cc source/blender/blenloader/intern/writefile.c
Simple merge

diff --cc source/blender/editors/curve/editfont.c
Simple merge

diff --cc source/blender/editors/gpencil/gpencil_paint.c
Simple merge

diff --cc source/blender/editors/include/ED_object.h
index 9a444c36758880833cce941658d080ae1f69a79e,c646ec555064e637fd234e7a1bd19a0b7b19955c..2cda5e070d3e807dd485d887942a1e1c630f59af
--- 1/source/blender/editors/include/ED_object.h
--- 2/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@@ -104,14 -104,11 +104,14 @@@ float ED_object_new_primitive_matrix(st
  
  void ED_object_add_generic_props(struct wmOperatorType *ot, int do_editmode);
  int ED_object_add_generic_invoke(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
 -int ED_object_add_generic_get_opts(struct bContext *C, struct wmOperator *op, float *loc, float *rot, int *enter_editmode, unsigned int *layer);
 -struct Object *ED_object_add_type(struct bContext *C, int type, float *loc, float *rot, int enter_editmode, unsigned int layer);
 +int ED_object_add_generic_get_opts(struct bContext *C, struct wmOperator *op, 
 +      float *loc, float *rot, int *enter_editmode, unsigned int *layer, int *is_view_aligned);
 +
 +struct Object *ED_object_add_type(struct bContext *C, int type, float *loc,
 +      float *rot, int enter_editmode, unsigned int layer);
  
  void ED_object_single_users(struct Main *bmain, struct Scene *scene, int full);
- 
+ void ED_object_single_user(struct Scene *scene, struct Object *ob);
  
  /* object motion paths */
  void ED_objects_clear_paths(struct bContext *C);

diff --cc source/blender/editors/object/object_edit.c
Simple merge

diff --cc source/blender/editors/object/object_relations.c
Simple merge

diff --cc source/blender/editors/space_view3d/drawobject.c
Simple merge

diff --cc source/blender/editors/transform/CMakeLists.txt
Simple merge

diff --cc source/blender/editors/transform/transform.c
Simple merge

diff --cc source/blender/editors/transform/transform.h
index 396ed4325447179645a1af80db9d98099cba2730,485344875d445761152616c484681b232ffea110..062e13f1ad42806736ead66d91529ec485da76b8
--- 1/source/blender/editors/transform/transform.h
--- 2/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@@ -68,16 -66,7 +68,8 @@@ struct wmEvent
  struct wmTimer;
  struct ARegion;
  struct ReportList;
 +struct SmallHash;
  
- typedef struct NDofInput {
-       int             flag;
-       int             axis;
-       float   fval[7];
-       float   factor[3];
- } NDofInput;
- 
- 
  /*
        The ctrl value has different meaning:
                0                       : No value has been typed

diff --cc source/blender/editors/transform/transform_generics.c
Simple merge

diff --cc source/blender/makesdna/DNA_userdef_types.h
Simple merge

diff --cc source/blender/makesrna/intern/rna_scene.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_wm_api.c
Simple merge

diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
Simple merge