Merged changes in the trunk up to revision 44436.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Feb 2012 21:11:29 +0000 (21:11 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 25 Feb 2012 21:11:29 +0000 (21:11 +0000)
1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/bmesh/bmesh.h
source/blender/bmesh/operators/bmo_utils.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_scene_types.h

Simple merge
index 68123ee7412f77fa27d9634e53352972f7244326,1acdf05ef35f33d13e3a4ea812c09d8d08668417..f57e91b05c07381cfe204ce9b8115c1d53580959
@@@ -641,16 -642,9 +642,16 @@@ void bmesh_similarfaces_exec(BMesh *bm
                                        case SIMFACE_PERIMETER:
                                                if (fabsf(f_ext[i].perim - f_ext[indices[idx]].perim) <= thresh) {
                                                        BMO_elem_flag_enable(bm, fm, FACE_MARK);
-                                                       cont = 0;
+                                                       cont = FALSE;
                                                }
                                                break;
 +
 +                                      case SIMFACE_FREESTYLE:
 +                                              if (BM_elem_flag_test(fm, BM_ELEM_FREESTYLE) == BM_elem_flag_test(fs, BM_ELEM_FREESTYLE)) {
 +                                                      BMO_elem_flag_enable(bm, fm, FACE_MARK);
 +                                                      cont = 0;
 +                                              }
 +                                              break;
                                }
                        }
                }
@@@ -845,16 -839,9 +846,16 @@@ void bmesh_similaredges_exec(BMesh *bm
                                        case SIMEDGE_SHARP:
                                                if (BM_elem_flag_test(e, BM_ELEM_SMOOTH) == BM_elem_flag_test(es, BM_ELEM_SMOOTH)) {
                                                        BMO_elem_flag_enable(bm, e, EDGE_MARK);
-                                                       cont = 0;
+                                                       cont = FALSE;
                                                }
                                                break;
 +
 +                                      case SIMEDGE_FREESTYLE:
 +                                              if (BM_elem_flag_test(e, BM_ELEM_FREESTYLE) == BM_elem_flag_test(es, BM_ELEM_FREESTYLE)) {
 +                                                      BMO_elem_flag_enable(bm, e, EDGE_MARK);
 +                                                      cont = 0;
 +                                              }
 +                                              break;
                                }
                        }
                }
index d142028dd06ee4b7d1bc1cb35f6bf2a326ef4904,ec64caa82539beb6fb9ec9180e0c06fca875a614..3f2dc0bcbf573f2a3620ac64fcac82e4a48da285
@@@ -1164,17 -1162,11 +1164,14 @@@ static void edgetag_context_set(BMEditM
                BM_elem_select_set(em->bm, e, val);
                break;
        case EDGE_MODE_TAG_SEAM:
-               if (val)                {BM_elem_flag_enable(e, BM_ELEM_SEAM);}
-               else                    {BM_elem_flag_disable(e, BM_ELEM_SEAM);}
+               BM_elem_flag_set(e, BM_ELEM_SEAM, val);
                break;
        case EDGE_MODE_TAG_SHARP:
-               if (val)                {BM_elem_flag_enable(e, BM_ELEM_SEAM);}
-               else                    {BM_elem_flag_disable(e, BM_ELEM_SEAM);}
+               BM_elem_flag_set(e, BM_ELEM_SMOOTH, !val);
                break;
-               if (val)                {BM_elem_flag_enable(e, BM_ELEM_FREESTYLE);}
-               else                    {BM_elem_flag_disable(e, BM_ELEM_FREESTYLE);}
 +      case EDGE_MODE_TAG_FREESTYLE:
++              BM_elem_flag_set(e, BM_ELEM_FREESTYLE, val);
 +              break;
        case EDGE_MODE_TAG_CREASE:
         {
                float *crease = CustomData_bmesh_get(&em->bm->edata, e->head.data, CD_CREASE);