svn merge ^/trunk/blender -r41100:41150

diff --cc CMakeLists.txt
Simple merge

diff --cc intern/ghost/intern/GHOST_SystemSDL.cpp
index 12669ed1a19c4900feb879d4de5b4b2dad2ed286,11bd562f7674537edfa35e93d6857c9ef98d4c78..2d53915b5648c15903c4358379ed997c4cccdaf3
mode 100755,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_view3d.py
Simple merge

diff --cc source/blender/blenkernel/SConscript
Simple merge

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

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

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

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

diff --cc source/blender/blenkernel/intern/particle_system.c
index 54af061dedbc8aaddaec392002dbf26d080991d5,64a90e15b6033f1d0c3c43cb6cbee055e5a66a43..668502382845d7767012ff07085a2f3b40f0f182
--- 1/source/blender/blenkernel/intern/particle_system.c
--- 2/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@@ -69,9 -70,7 +69,8 @@@
  #include "BLI_listbase.h"
  #include "BLI_threads.h"
  #include "BLI_storage.h" /* For _LARGEFILE64_SOURCE;  zlib needs this on some systems */
- #include "BLI_string.h"
  #include "BLI_utildefines.h"
 +#include "BLI_edgehash.h"
  
  #include "BKE_main.h"
  #include "BKE_animsys.h"

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

diff --cc source/blender/blenlib/BLI_utildefines.h
Simple merge

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

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

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

diff --cc source/blender/editors/armature/editarmature.c
Simple merge

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

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

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

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

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

diff --cc source/blender/editors/screen/screen_ops.c
Simple merge

diff --cc source/blender/editors/sculpt_paint/paint_image.c
Simple merge

diff --cc source/blender/editors/sculpt_paint/sculpt_undo.c
Simple merge

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

diff --cc source/blender/editors/uvedit/uvedit_unwrap_ops.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_mesh.c
index f29c74caac14376ef5e04938778e9f8857b6a38f,c4f33f9cf1028f7e93204d68444edf9ee56ac22f..e076053b6e69ad57db3db1cf6b1ca43f6ba4f44d
--- 1/source/blender/makesrna/intern/rna_mesh.c
--- 2/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@@ -1440,8 -1388,9 +1440,8 @@@ static void rna_def_mtexpoly(BlenderRN
  
        prop= RNA_def_property(srna, "active_render", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "active_rnd", 0);
 -      RNA_def_property_boolean_funcs(prop, "rna_MeshTextureFaceLayer_active_render_get",
 -                                     "rna_MeshTextureFaceLayer_active_render_set");
 +      RNA_def_property_boolean_funcs(prop, "rna_MeshTextureFaceLayer_active_render_get", "rna_MeshTextureFaceLayer_active_render_set");
-       RNA_def_property_ui_text(prop, "Active Render", "Sets the layer as active for rendering");
+       RNA_def_property_ui_text(prop, "Active Render", "Set the layer as active for rendering");
        RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
  
        prop= RNA_def_property(srna, "active_clone", PROP_BOOLEAN, PROP_NONE);
@@@ -1923,8 -1834,9 +1923,9 @@@ static void rna_def_mesh(BlenderRNA *br
  
        /* UV textures */
        prop= RNA_def_property(srna, "uv_textures", PROP_COLLECTION, PROP_NONE);
 -      RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer");
 +      RNA_def_property_collection_sdna(prop, NULL, "pdata.layers", "pdata.totlayer");
-       RNA_def_property_collection_funcs(prop, "rna_Mesh_uv_textures_begin", NULL, NULL, NULL, "rna_Mesh_uv_textures_length", NULL, NULL, NULL);
+       RNA_def_property_collection_funcs(prop, "rna_Mesh_uv_textures_begin", NULL, NULL, NULL,
+                                         "rna_Mesh_uv_textures_length", NULL, NULL, NULL);
        RNA_def_property_struct_type(prop, "MeshTextureFaceLayer");
        RNA_def_property_ui_text(prop, "UV Textures", "");
        rna_def_uv_textures(brna, prop);
@@@ -1952,27 -1865,31 +1953,31 @@@
        /* Vertex colors */
  
        prop= RNA_def_property(srna, "vertex_colors", PROP_COLLECTION, PROP_NONE);
 -      RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer");
 +      RNA_def_property_collection_sdna(prop, NULL, "ldata.layers", "ldata.totlayer");
-       RNA_def_property_collection_funcs(prop, "rna_Mesh_vertex_colors_begin", NULL, NULL, NULL, "rna_Mesh_vertex_colors_length", NULL, NULL, NULL);
+       RNA_def_property_collection_funcs(prop, "rna_Mesh_vertex_colors_begin", NULL, NULL, NULL,
+                                         "rna_Mesh_vertex_colors_length", NULL, NULL, NULL);
        RNA_def_property_struct_type(prop, "MeshColorLayer");
        RNA_def_property_ui_text(prop, "Vertex Colors", "");
        rna_def_vertex_colors(brna, prop);
  
        prop= RNA_def_property(srna, "layers_float", PROP_COLLECTION, PROP_NONE);
 -      RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer");
 +      RNA_def_property_collection_sdna(prop, NULL, "pdata.layers", "pdata.totlayer");
-       RNA_def_property_collection_funcs(prop, "rna_Mesh_float_layers_begin", NULL, NULL, NULL, "rna_Mesh_float_layers_length", NULL, NULL, NULL);
+       RNA_def_property_collection_funcs(prop, "rna_Mesh_float_layers_begin", NULL, NULL, NULL,
+                                         "rna_Mesh_float_layers_length", NULL, NULL, NULL);
        RNA_def_property_struct_type(prop, "MeshFloatPropertyLayer");
        RNA_def_property_ui_text(prop, "Float Property Layers", "");
  
        prop= RNA_def_property(srna, "layers_int", PROP_COLLECTION, PROP_NONE);
 -      RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer");
 +      RNA_def_property_collection_sdna(prop, NULL, "pdata.layers", "pdata.totlayer");
-       RNA_def_property_collection_funcs(prop, "rna_Mesh_int_layers_begin", NULL, NULL, NULL, "rna_Mesh_int_layers_length", NULL, NULL, NULL);
+       RNA_def_property_collection_funcs(prop, "rna_Mesh_int_layers_begin", NULL, NULL, NULL,
+                                         "rna_Mesh_int_layers_length", NULL, NULL, NULL);
        RNA_def_property_struct_type(prop, "MeshIntPropertyLayer");
        RNA_def_property_ui_text(prop, "Int Property Layers", "");
  
        prop= RNA_def_property(srna, "layers_string", PROP_COLLECTION, PROP_NONE);
 -      RNA_def_property_collection_sdna(prop, NULL, "fdata.layers", "fdata.totlayer");
 +      RNA_def_property_collection_sdna(prop, NULL, "pdata.layers", "pdata.totlayer");
-       RNA_def_property_collection_funcs(prop, "rna_Mesh_string_layers_begin", NULL, NULL, NULL, "rna_Mesh_string_layers_length", NULL, NULL, NULL);
+       RNA_def_property_collection_funcs(prop, "rna_Mesh_string_layers_begin", NULL, NULL, NULL,
+                                         "rna_Mesh_string_layers_length", NULL, NULL, NULL);
        RNA_def_property_struct_type(prop, "MeshStringPropertyLayer");
        RNA_def_property_ui_text(prop, "String Property Layers", "");
  

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

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

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

diff --cc source/blender/modifiers/intern/MOD_bevel.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_boolean_util.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_mask.c
Simple merge

diff --cc source/blender/modifiers/intern/MOD_solidify.c
index fdef0530daa0eebad64c7bb70c0151d9f79b8694,f2e3a0d016a8d748c40b79409d5f9a7547918921..e245339c9e4c495fa7ed56d1987722a730d02121
--- 1/source/blender/modifiers/intern/MOD_solidify.c
--- 2/source/blender/modifiers/intern/MOD_solidify.c
+++ b/source/blender/modifiers/intern/MOD_solidify.c
@@@ -37,11 -37,10 +37,12 @@@
  
  #include "DNA_meshdata_types.h"
  
 +#include "BLI_utildefines.h"
  #include "BLI_math.h"
  #include "BLI_edgehash.h"
 -#include "BLI_utildefines.h"
 +#include "BLI_array.h"
 +#include "BLI_smallhash.h"
+ #include "BLI_string.h"
  
  #include "BKE_cdderivedmesh.h"
  #include "BKE_mesh.h"

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

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