Merged changes in the trunk up to revision 47381.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

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

diff --cc source/blender/SConscript
Simple merge

diff --cc source/blender/blenkernel/CMakeLists.txt
Simple merge

diff --cc source/blender/blenkernel/intern/anim_sys.c
index e8e8a100f34043e1b19a434444adc8ffd97da7d1,1358c2e34a8dc2269b6d1772b5beaeb5845f16b2..b042c0091d767e1137b1612e97a8697cb1d5ec46
--- 1/source/blender/blenkernel/intern/anim_sys.c
--- 2/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@@ -745,8 -744,8 +745,8 @@@ void BKE_animdata_main_cb(Main *mainptr
        for (id = first; id; id = id->next) { \
                AnimData *adt = BKE_animdata_from_id(id); \
                if (adt) func(id, adt, user_data); \
-       }
+       } (void)0
 -      
 +
        /* "embedded" nodetree cases (i.e. scene/material/texture->nodetree) */
  #define ANIMDATA_NODETREE_IDS_CB(first, NtId_Type) \
        for (id = first; id; id = id->next) { \
@@@ -757,14 -756,14 +757,14 @@@
                        if (adt2) func(id, adt2, user_data); \
                } \
                if (adt) func(id, adt, user_data); \
-       }
+       } (void)0
 -      
 +
        /* nodes */
        ANIMDATA_IDS_CB(mainptr->nodetree.first);
 -      
 +              
        /* textures */
        ANIMDATA_NODETREE_IDS_CB(mainptr->tex.first, Tex);
 -      
 +              
        /* lamps */
        ANIMDATA_IDS_CB(mainptr->lamp.first);
        

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

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

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

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

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

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

diff --cc source/blender/blenlib/intern/bpath.c
Simple merge

diff --cc source/blender/blenloader/intern/readfile.c
index 8a589bd191cc8885c961774b8e033913098abd82,8710c5fe075b3622f83bc8e9974d1e3cc0bf8121..6cad85aa2733a4a096b842907ad898f570aa6403
--- 1/source/blender/blenloader/intern/readfile.c
--- 2/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -7708,36 -7508,19 +7697,49 @@@ static void do_versions(FileData *fd, L
                }
        }
        
+       if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 8))
+       {
+               /* set new deactivation values for game settings */
+               Scene *sce;
+ 
+               for (sce = main->scene.first; sce; sce = sce->id.next) {
+                       /* Game Settings */
+                       sce->gm.lineardeactthreshold = 0.8f;
+                       sce->gm.angulardeactthreshold = 1.0f;
+                       sce->gm.deactivationtime = 2.0f;
+               }
+       }
+ 
 +      /* default values in Freestyle settings */
 +      {
 +              Scene *sce;
 +              SceneRenderLayer *srl;
 +              FreestyleLineStyle *linestyle;
 +
 +              for(sce = main->scene.first; sce; sce = sce->id.next) {
 +                      if (sce->r.line_thickness_mode == 0) {
 +                              sce->r.line_thickness_mode= R_LINE_THICKNESS_ABSOLUTE;
 +                              sce->r.unit_line_thickness= 1.f;
 +                      }
 +                      for(srl= sce->r.layers.first; srl; srl= srl->next) {
 +                              if (srl->freestyleConfig.mode == 0)
 +                                      srl->freestyleConfig.mode= FREESTYLE_CONTROL_EDITOR_MODE;
 +                              if (srl->freestyleConfig.raycasting_algorithm == 0)
 +                                      srl->freestyleConfig.raycasting_algorithm= FREESTYLE_ALGO_CULLED_ADAPTIVE_CUMULATIVE;
 +                      }
 +              }
 +              for(linestyle = main->linestyle.first; linestyle; linestyle = linestyle->id.next) {
 +                      if (linestyle->thickness_position == 0) {
 +                              linestyle->thickness_position= LS_THICKNESS_CENTER;
 +                              linestyle->thickness_ratio= 0.5f;
 +                      }
 +                      if (linestyle->chaining == 0)
 +                              linestyle->chaining= LS_CHAINING_PLAIN;
 +                      if (linestyle->rounds == 0)
 +                              linestyle->rounds= 3;
 +              }
 +      }
 +      
        /* WATCH IT!!!: pointers from libdata have not been converted yet here! */
        /* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
        {

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

diff --cc source/blender/editors/animation/anim_channels_defines.c
Simple merge

diff --cc source/blender/editors/animation/anim_channels_edit.c
Simple merge

diff --cc source/blender/editors/include/UI_resources.h
Simple merge

diff --cc source/blender/editors/interface/interface_templates.c
Simple merge

diff --cc source/blender/editors/interface/resources.c
Simple merge

diff --cc source/blender/editors/mesh/editmesh_tools.c
Simple merge

diff --cc source/blender/editors/mesh/mesh_ops.c
Simple merge

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

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

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

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

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

diff --cc source/blender/makesrna/RNA_access.h
Simple merge

diff --cc source/blender/makesrna/intern/CMakeLists.txt
Simple merge

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

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

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

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

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

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

diff --cc source/blender/render/intern/source/convertblender.c
Simple merge

diff --cc source/blender/render/intern/source/shadeoutput.c
Simple merge

diff --cc source/creator/CMakeLists.txt
Simple merge

diff --cc source/creator/creator.c
Simple merge