Merged changes in the trunk up to revision 43038.

Conflicts resolved:
source/blender/makesdna/DNA_material_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c

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

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

diff --cc source/blender/blenlib/CMakeLists.txt
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/interface/interface_templates.c
Simple merge

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

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

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

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

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

diff --cc source/blender/makesdna/DNA_material_types.h
index a693e946cc498885024b252c3ba44fb8b6365f82,55e9328a72a66eee19d8b5339b6e5b338e233123..82939d96ca054fd540c35bc077f60b9fffe9bdd9
--- 1/source/blender/makesdna/DNA_material_types.h
--- 2/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@@ -168,12 -169,9 +169,12 @@@ typedef struct Material 
        short sss_flag, sss_preset;
  
        int mapto_textured;     /* render-time cache to optimise texture lookups */
-       short shadowonly_flag;          /* "shadowsonly" type */
-       short index;    /* custom index for render passes */
+       short shadowonly_flag;  /* "shadowsonly" type */
+       short index;            /* custom index for render passes */
  
 +      short vcol_alpha;
 +      short pad[3];
 +
        ListBase gpumaterial;           /* runtime */
  } Material;
  

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

diff --cc source/blender/makesdna/DNA_meshdata_types.h
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/makesrna/RNA_access.h
Simple merge

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

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

diff --cc source/blender/python/intern/CMakeLists.txt
index 73b2285ca131e3146c41f0401b86b7f8c9444f27,f110576a297f484bbf1fadb4b82216d738b192c2..76fe439027f68c616d786b5ee66cd0e838d7b6af
--- 1/source/blender/python/intern/CMakeLists.txt
--- 2/source/blender/python/intern/CMakeLists.txt
+++ b/source/blender/python/intern/CMakeLists.txt
@@@ -33,8 -33,7 +33,8 @@@ set(IN
        ../../makesdna
        ../../makesrna
        ../../windowmanager
-     ../../gpu
+       ../../gpu
 +      ../../freestyle/intern/python
        ../../../../intern/guardedalloc
  )
  

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

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

diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
index 4e74df6c4bccf62a68136cfa913b9b986054f3d1,75d1f182189d938ae81ae4088d58105b0708424c..b9d5a9b94ec881969a388cc01f44aa379f0f7a45
--- 1/source/blenderplayer/bad_level_call_stubs/stubs.c
--- 2/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@@ -467,13 -464,16 +467,23 @@@ void BPY_DECREF(void *pyob_ptr) {
  void BPY_pyconstraint_exec(struct bPythonConstraint *con, struct bConstraintOb *cob, struct ListBase *targets) {}
  void macro_wrapper(struct wmOperatorType *ot, void *userdata) {} ;
  
 +/* Freestyle */
 +void FRS_add_freestyle_config(struct SceneRenderLayer* srl) {}
 +void FRS_free_freestyle_config(struct SceneRenderLayer* srl) {}
 +struct FreestyleLineSet *FRS_get_active_lineset(struct FreestyleConfig *config) { return NULL; }
 +short FRS_get_active_lineset_index(struct FreestyleConfig *config) { return 0; }
 +void FRS_set_active_lineset_index(struct FreestyleConfig *config, short index) {}
 +void FRS_unlink_target_object(struct FreestyleConfig *config, struct Object *ob) {}
+ /* intern/dualcon */
+ struct DualConMesh;
+ struct DualConMesh *dualcon(const struct DualConMesh *input_mesh,
+                           void *create_mesh,
+                           int flags,
+                           int mode,
+                           float threshold,
+                           float hermite_num,
+                           float scale,
+                           int depth) {return 0;}
  
  
  char blender_path[] = "";

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