svn merge -r37335:37500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Sun, 24 Jul 2011 13:03:48 +0000 (13:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 24 Jul 2011 13:03:48 +0000 (13:03 +0000)
19 files changed:
1  2 
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/multires.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_bake.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform_generics.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/modifiers/intern/MOD_explode.c
source/blender/modifiers/intern/MOD_fluidsim_util.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/render/intern/source/convertblender.c
source/blender/windowmanager/intern/wm_init_exit.c
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt
source/creator/creator.c

index 60f5ee02b13801a53a54e673b2d5ae4ca328214b,71ebe5e051cc8ff5db1bf5f8a6e92a764b095906..7969187d3ec7bb5414c36b9358cbdfc94bf13578
@@@ -673,14 -672,15 +673,15 @@@ void recalcData(TransInfo *t
                                if(la->editlatt->latt->flag & LT_OUTSIDE) outside_lattice(la->editlatt->latt);
                        }
                        else if (t->obedit->type == OB_MESH) {
 -                              EditMesh *em = ((Mesh*)t->obedit->data)->edit_mesh;
 +                              BMEditMesh *em = ((Mesh*)t->obedit->data)->edit_btmesh;
                                /* mirror modifier clipping? */
                                if(t->state != TRANS_CANCEL) {
-                                       clipMirrorModifier(t, t->obedit);
+                                       /* apply clipping after so we never project past the clip plane [#25423] */
                                        applyProject(t);
+                                       clipMirrorModifier(t, t->obedit);
                                }
                                if((t->options & CTX_NO_MIRROR) == 0 && (t->flag & T_MIRROR))
 -                                      editmesh_apply_to_mirror(t);
 +                                      editbmesh_apply_to_mirror(t);
                                        
                                DAG_id_tag_update(t->obedit->data, 0);  /* sets recalc flags */
                                
Simple merge
Simple merge
Simple merge