svn merge ^/trunk/blender -r40587:40643
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Sep 2011 07:34:48 +0000 (07:34 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Sep 2011 07:34:48 +0000 (07:34 +0000)
34 files changed:
1  2 
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/BME_structure.c
source/blender/blenkernel/intern/BME_tools.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/idcode.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/BLI_callbacks.h
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/threads.c
source/blender/editors/curve/editcurve.c
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/mesh/SConscript
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/object/CMakeLists.txt
source/blender/editors/object/SConscript
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_snap.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/modifiers/intern/MOD_explode.c
source/blender/python/intern/bpy_app_handlers.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt

index c9b746cec33fa9a41ac3a6233dea2438fc6cb2a6,a95d149f0585b308bb8e1b4d3a90520cc400f21b..17df83f1edc860605d5b22c2265ff7063b1d4ef2
@@@ -406,8 -405,8 +406,8 @@@ static BME_Vert *BME_bevel_split_edge(B
                 * I wanted to use the same function for both wire edges and poly loops
                 * so... here we walk around edges to find the needed verts */
                forward = 1;
-               is_split_vert = 0;
+               /* is_split_vert = 0; */ /* UNUSED */
 -              if (v->edge == NULL) {
 +              if (v->e == NULL) {
                        //printf("We can't split a loose vert's edge!\n");
                        return NULL;
                }
@@@ -961,9 -960,9 +961,9 @@@ static BME_Mesh *BME_bevel_initialize(B
                        len = 0;
                }
                else {
 -                      len = BME_cycle_length(BME_disk_getpointer(v->edge,v));
 +                      len = BME_cycle_length(BME_disk_getpointer(v->e,v));
                        /* we'll assign a default transform data to every vert (except the loose ones) */
-                       vtd = BME_assign_transdata(td, bm, v, v->co, v->co, NULL, NULL, 0, -1, -1, NULL);
+                       /* vtd = */ /* UNUSED */ BME_assign_transdata(td, bm, v, v->co, v->co, NULL, NULL, 0, -1, -1, NULL);
                }
  
                /* check for non-manifold vert */
index f37e05e984268799ac187b54dd09bfe8db7029a1,063b5e961e0eb5c51a549f6516dbcc6b2393a961..5994b8a3a38ed617a4584424c19508155cf47b46
mode 100755,100644..100755
index c0e0714c43ed28d50b36ae3a4d2e6dec6c43daa1,f44f7fbb8d5d3451e06bfa894150aa152963ca43..d7a93283640e15ef472af0c2937e08836dedba78
@@@ -153,15 -151,12 +153,21 @@@ 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);
+ #endif
  }
  
  #if 0 /* UNUSED, remove? */
index 4607cc4b1bf73130c555392d3152bb8b94e4a905,d4739236ba1d60294b66d0bb4495d80427b43071..883d0ca20ae5343dbee5bceda70d96f51f15fb87
@@@ -5,9 -5,9 +5,9 @@@ sources = env.Glob('*.c'
  
  incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
  incs += ' ../../windowmanager #/intern/guardedalloc ../../blenloader'
 -incs += ' ../../makesrna ../../python ../../ikplugin'
 +incs += ' ../../makesrna ../../python ../../ikplugin ../../bmesh'
  incs += ' ../../render/extern/include ../../gpu' # for object_bake.c
- incs += ' #extern/recastnavigation/Recast/Include'
+ incs += ' #extern/recastnavigation'
  
  defs = []
  
index f115642cf8e95ec20b17e2796cc9ab8d049eda3a,5a2437b19119c80f8223a6eafa668c05da23e396..e083528e2ca78439d89d70ad58c03017a2acff20
@@@ -214,15 -214,8 +214,9 @@@ void ED_operatortypes_object(void
  
        WM_operatortype_append(OBJECT_OT_bake_image);
        WM_operatortype_append(OBJECT_OT_drop_named_material);
 -}
  
- #ifdef WITH_GAMEENGINE
-       WM_operatortype_append(OBJECT_OT_create_navmesh);
-       WM_operatortype_append(OBJECT_OT_assign_navpolygon);
-       WM_operatortype_append(OBJECT_OT_assign_new_navpolygon);
- #endif
 +      WM_operatortype_append(OBJECT_OT_test_multires);
 +}
  
  void ED_operatormacros_object(void)
  {
index bfd4be66c03f2a4363a635cc3c6a12518dda0570,cbf079bccefb215c4752acb6c2ae8a11afecc75d..645079ca24e59110f6454ff2fc09323d88f746f5
@@@ -543,10 -543,11 +543,11 @@@ static void remap_uvs_23(DerivedMesh *d
        }
  }
  
- static DerivedMesh * cutEdges(ExplodeModifierData *emd, DerivedMesh *dm){
+ static DerivedMesh * cutEdges(ExplodeModifierData *emd, DerivedMesh *dm)
+ {
        DerivedMesh *splitdm;
        MFace *mf=NULL,*df1=NULL;
 -      MFace *mface=dm->getFaceArray(dm);
 +      MFace *mface=dm->getTessFaceArray(dm);
        MVert *dupve, *mv;
        EdgeHash *edgehash;
        EdgeHashIterator *ehi;
Simple merge
Simple merge