[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40009] branches/bmesh/blender/source/ blender/editors: bmesh: small fixes for compilation and subdivide operator

[Sergey Sharybin]

Revision: 40009
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40009
Author:   nazgul
Date:     2011-09-07 12:06:08 +0000 (Wed, 07 Sep 2011)
Log Message:
-----------
bmesh: small fixes for compilation and subdivide operator

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c

Modified: branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2011-09-07 11:53:16 UTC (rev 40008)
+++ branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c	2011-09-07 12:06:08 UTC (rev 40009)
@@ -163,7 +163,7 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 
 	/* properties */
-	RNA_def_int(ot->srna, "number_cuts", 1, 1, 50, "Number of Cuts", "", 1, INT_MAX);
+	RNA_def_int(ot->srna, "number_cuts", 1, 1, INT_MAX, "Number of Cuts", "", 1, 10);
 
 	RNA_def_boolean(ot->srna, "quadtri", 0, "Quad/Tri Mode", "Tries to prevent ngons");
 	RNA_def_enum(ot->srna, "quadcorner", prop_mesh_cornervert_types, SUBD_STRAIGHT_CUT, "Quad Corner Type", "How to subdivide quad corners (anything other then Straight Cut will prevent ngons)");

Modified: branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c	2011-09-07 11:53:16 UTC (rev 40008)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c	2011-09-07 12:06:08 UTC (rev 40009)
@@ -1810,7 +1810,7 @@
 
 	if(rv3d->persp==RV3D_CAMOB && startscene->gm.framing.type == SCE_GAMEFRAMING_BARS && startscene->gm.stereoflag != STEREO_DOME) { /* Letterbox */
 		rctf cam_framef;
-		ED_view3d_calc_camera_border(startscene, ar, rv3d, CTX_wm_view3d(C), &cam_framef, FALSE);
+		ED_view3d_calc_camera_border(startscene, ar, CTX_wm_view3d(C), rv3d, &cam_framef, FALSE);
 		cam_frame.xmin = cam_framef.xmin + ar->winrct.xmin;
 		cam_frame.xmax = cam_framef.xmax + ar->winrct.xmin;
 		cam_frame.ymin = cam_framef.ymin + ar->winrct.ymin;