[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60142] trunk/blender/source: - update bl_run_operators.py for change in blender.
Campbell Barton
ideasman42 at gmail.com
Sun Sep 15 03:46:27 CEST 2013
Revision: 60142
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60142
Author: campbellbarton
Date: 2013-09-15 01:46:25 +0000 (Sun, 15 Sep 2013)
Log Message:
-----------
- update bl_run_operators.py for change in blender.
- rename curve delete operator vertices enum to match mesh delete operator.
- add missing NULL checks to view3d_lock_poll() to prevent crashes when called outside a view3d.
Modified Paths:
--------------
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/tests/bl_run_operators.py
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2013-09-14 20:09:00 UTC (rev 60141)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2013-09-15 01:46:25 UTC (rev 60142)
@@ -6245,7 +6245,7 @@
}
static EnumPropertyItem curve_delete_type_items[] = {
- {CURVE_VERTEX, "VERTICES", 0, "Vertices", ""},
+ {CURVE_VERTEX, "VERT", 0, "Vertices", ""},
{CURVE_SEGMENT, "SEGMENT", 0, "Segments", ""},
{0, NULL, 0, NULL, NULL}
};
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2013-09-14 20:09:00 UTC (rev 60141)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2013-09-15 01:46:25 UTC (rev 60142)
@@ -1012,9 +1012,13 @@
static int view3d_lock_poll(bContext *C)
{
View3D *v3d = CTX_wm_view3d(C);
- RegionView3D *rv3d = CTX_wm_region_view3d(C);
-
- return ED_view3d_offset_lock_check(v3d, rv3d);
+ if (v3d) {
+ RegionView3D *rv3d = CTX_wm_region_view3d(C);
+ if (rv3d) {
+ return ED_view3d_offset_lock_check(v3d, rv3d);
+ }
+ }
+ return false;
}
static int viewrotate_cancel(bContext *C, wmOperator *op)
Modified: trunk/blender/source/tests/bl_run_operators.py
===================================================================
--- trunk/blender/source/tests/bl_run_operators.py 2013-09-14 20:09:00 UTC (rev 60141)
+++ trunk/blender/source/tests/bl_run_operators.py 2013-09-15 01:46:25 UTC (rev 60142)
@@ -342,7 +342,8 @@
def ctx_editmode_curves_empty():
bpy.ops.curve.primitive_nurbs_circle_add()
bpy.ops.object.mode_set(mode='EDIT')
- bpy.ops.curve.delete(type='ALL')
+ bpy.ops.curve.select_all(action='SELECT')
+ bpy.ops.curve.delete(type='VERT')
def ctx_editmode_surface():
More information about the Bf-blender-cvs
mailing list