svn merge ^/trunk/blender -r40890:40950
authorCampbell Barton <ideasman42@gmail.com>
Fri, 14 Oct 2011 01:35:20 +0000 (01:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 14 Oct 2011 01:35:20 +0000 (01:35 +0000)
35 files changed:
1  2 
source/blender/blenkernel/BKE_cdderivedmesh.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/BKE_subsurf.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/curve/editfont.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_transform.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/mathutils/mathutils_Quaternion.c

Simple merge
Simple merge
@@@ -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);
 +
  ///////////////////////////////////
  ///////////////////////////////////
  
@@@ -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"
@@@ -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
  
@@@ -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
  }
  
@@@ -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);
        
@@@ -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;