svn merge ^/trunk/blender -r40890:40950

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

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

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

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

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

diff --cc source/blender/blenkernel/intern/DerivedMesh.c
index 1578eebb4fe7099031d6892957e51549674571cc,c379111ccfd13d0d465bb212821d12a8964050bd..36753fcb02c652822f5af996f80cceb0b3159d67
--- 1/source/blender/blenkernel/intern/DerivedMesh.c
--- 2/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@@ -81,11 -78,6 +82,9 @@@ static DerivedMesh *navmesh_dm_createNa
  
  extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
  
- static DerivedMesh *navmesh_dm_createNavMeshForVisualization(DerivedMesh *dm);
- 
 +static void add_shapekey_layers(DerivedMesh *dm, Mesh *me, Object *ob);
 +static void shapekey_layers_to_keyblocks(DerivedMesh *dm, Mesh *me, int actshape_uid);
 +
  ///////////////////////////////////
  ///////////////////////////////////
  

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

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

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

diff --cc source/blender/blenkernel/intern/cdderivedmesh.c
index 5fbb87e618c48f5827f04cbef6be78d86a3f3b66,4d37d8e06066adeaaceba1b344c818f8f507d4b5..fc571627ec938543cb9160153ad801216eed5272
--- 1/source/blender/blenkernel/intern/cdderivedmesh.c
--- 2/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@@ -1,53 -1,43 +1,53 @@@
 -/*
 + /*
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software  Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2006 Blender Foundation.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): Ben Batt <benbatt@gmail.com>
- *
- * ***** END GPL LICENSE BLOCK *****
- *
- * Implementation of CDDerivedMesh.
- *
- * BKE_cdderivedmesh.h contains the function prototypes for this file.
- *
- */
+  * $Id$
+  *
+  * ***** BEGIN GPL LICENSE BLOCK *****
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version 2
+  * of the License, or (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software  Foundation,
+  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+  *
+  * The Original Code is Copyright (C) 2006 Blender Foundation.
+  * All rights reserved.
+  *
+  * The Original Code is: all of this file.
+  *
+  * Contributor(s): Ben Batt <benbatt@gmail.com>
+  *
+  * ***** END GPL LICENSE BLOCK *****
+  *
+  * Implementation of CDDerivedMesh.
+  *
+  * BKE_cdderivedmesh.h contains the function prototypes for this file.
+  *
+  */
  
  /** \file blender/blenkernel/intern/cdderivedmesh.c
   *  \ingroup bke
   */
-  
+ 
  #include "GL/glew.h"
  
 +#include "BKE_cdderivedmesh.h"
 +#include "BKE_global.h"
 +#include "BKE_mesh.h"
 +#include "BKE_paint.h"
 +#include "BKE_utildefines.h"
 +#include "BKE_tessmesh.h"
 +
 +#include "BLI_editVert.h"
 +#include "BLI_scanfill.h"
 +#include "BLI_math.h"
  #include "BLI_blenlib.h"
  #include "BLI_edgehash.h"
  #include "BLI_editVert.h"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc source/blender/editors/mesh/mesh_intern.h
index a02335ae427de390b8ec4a48b0d638d5acd90854,9e6b4e84e54a3fc9fc89d7afb2568059fb7266c7..ffa3940849fa5cd96fe081583181002701100ba5
--- 1/source/blender/editors/mesh/mesh_intern.h
--- 2/source/blender/editors/mesh/mesh_intern.h
+++ b/source/blender/editors/mesh/mesh_intern.h
@@@ -311,10 -257,12 +311,17 @@@ void MESH_OT_bm_test(struct wmOperatorT
  void MESH_OT_edgering_select(struct wmOperatorType *ot);
  void MESH_OT_loopcut(struct wmOperatorType *ot);
  
 +void MESH_OT_knifetool(struct wmOperatorType *ot);
 +void MESH_OT_bevel(struct wmOperatorType *ot);
 +
 +void MESH_OT_bridge_edge_loops(struct wmOperatorType *ot);
 +
+ /* ******************* mesh_navmesh.c */
+ void MESH_OT_navmesh_make(struct wmOperatorType *ot);
+ void MESH_OT_navmesh_face_copy(struct wmOperatorType *ot);
+ void MESH_OT_navmesh_face_add(struct wmOperatorType *ot);
+ void MESH_OT_navmesh_reset(struct wmOperatorType *ot);
+ void MESH_OT_navmesh_clear(struct wmOperatorType *ot);
+ 
  #endif // MESH_INTERN_H
  

diff --cc source/blender/editors/mesh/mesh_ops.c
index db52df611b0dc5450744cc3b36fafe17bc78eed6,b1f0daeaddcea3ec1ecfdf8309003ca8a8199bac..617e011e4c97fba6f4ff8e6b71dca9509d196ba8
--- 1/source/blender/editors/mesh/mesh_ops.c
--- 2/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@@ -153,20 -151,13 +153,22 @@@ void ED_operatortypes_mesh(void
  
        WM_operatortype_append(MESH_OT_solidify);
        WM_operatortype_append(MESH_OT_select_nth);
 +      WM_operatortype_append(MESH_OT_vert_connect);
 +      WM_operatortype_append(MESH_OT_knifetool);
 +
 +      WM_operatortype_append(MESH_OT_bevel);
 +
 +      WM_operatortype_append(MESH_OT_select_next_loop);
 +      
 +      WM_operatortype_append(EXPORT_MESH_OT_wavefront);
 +      WM_operatortype_append(MESH_OT_bridge_edge_loops);
  
  #ifdef WITH_GAMEENGINE
-       WM_operatortype_append(MESH_OT_create_navmesh);
-       WM_operatortype_append(MESH_OT_assign_navpolygon);
-       WM_operatortype_append(MESH_OT_assign_new_navpolygon);
+       WM_operatortype_append(MESH_OT_navmesh_make);
+       WM_operatortype_append(MESH_OT_navmesh_face_copy);
+       WM_operatortype_append(MESH_OT_navmesh_face_add);
+       WM_operatortype_append(MESH_OT_navmesh_reset);
+       WM_operatortype_append(MESH_OT_navmesh_clear);
  #endif
  }
  

diff --cc source/blender/editors/object/object_modifier.c
index aefbf33e948e19b227c1abe113f10f971e416107,20ca50581bf465cb7b6ae089f3fc233a7cacbfaf..57d70dc85c011e410123003e9c87f64fced29352
--- 1/source/blender/editors/object/object_modifier.c
--- 2/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@@ -1232,12 -1160,9 +1232,9 @@@ static int multires_external_save_invok
        if (!mmd)
                return OPERATOR_CANCELLED;
        
 -      if(CustomData_external_test(&me->fdata, CD_MDISPS))
 +      if(CustomData_external_test(&me->ldata, CD_MDISPS))
                return OPERATOR_CANCELLED;
  
-       if(!RNA_property_is_set(op->ptr, "relative_path"))
-               RNA_boolean_set(op->ptr, "relative_path", U.flag & USER_RELPATHS);
- 
        if(RNA_property_is_set(op->ptr, "filepath"))
                return multires_external_save_exec(C, op);
        

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

diff --cc source/blender/editors/render/render_shading.c
Simple merge

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

diff --cc source/blender/makesdna/DNA_modifier_types.h
index 7bc81e7fe057dc3a82518deedb8aed453f603f1b,0344e6da0ff211d262fba5b59887d79094c51c8b..56bfc29fcc09e3a0275bdc1ba63a471a005f5b4c
--- 1/source/blender/makesdna/DNA_modifier_types.h
--- 2/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@@ -74,10 -74,8 +74,11 @@@ typedef enum ModifierType 
        eModifierType_WeightVGEdit,
        eModifierType_WeightVGMix,
        eModifierType_WeightVGProximity,
+       eModifierType_EmptySlot,    /* keep so DynamicPaint keep loading, can re-use later */
        eModifierType_DynamicPaint, /* reserve slot */
 +
 +      /* BMESH ONLY - keeps getting bumped by new modifiers in trunk */
 +      eModifierType_NgonInterp,
        NUM_MODIFIER_TYPES
  } ModifierType;
  

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/python/mathutils/mathutils_Quaternion.c
Simple merge