[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32140] trunk/blender/source/blender/ editors: bugfix [#23995] Do loop cuts from the space bar search while in the properties panel crashes blender .
Campbell Barton
ideasman42 at gmail.com
Mon Sep 27 07:44:19 CEST 2010
Revision: 32140
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32140
Author: campbellbarton
Date: 2010-09-27 07:44:15 +0200 (Mon, 27 Sep 2010)
Log Message:
-----------
bugfix [#23995] Do loop cuts from the space bar search while in the properties panel crashes blender.
Modified Paths:
--------------
trunk/blender/source/blender/editors/include/ED_screen.h
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/mesh/loopcut.c
trunk/blender/source/blender/editors/screen/screen_ops.c
Modified: trunk/blender/source/blender/editors/include/ED_screen.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_screen.h 2010-09-27 05:23:23 UTC (rev 32139)
+++ trunk/blender/source/blender/editors/include/ED_screen.h 2010-09-27 05:44:15 UTC (rev 32140)
@@ -141,6 +141,7 @@
int ED_operator_object_active_editable(struct bContext *C);
int ED_operator_editmesh(struct bContext *C);
int ED_operator_editmesh_view3d(struct bContext *C);
+int ED_operator_editmesh_region_view3d(struct bContext *C);
int ED_operator_editarmature(struct bContext *C);
int ED_operator_editcurve(struct bContext *C);
int ED_operator_editsurf(struct bContext *C);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2010-09-27 05:23:23 UTC (rev 32139)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2010-09-27 05:44:15 UTC (rev 32140)
@@ -2105,7 +2105,7 @@
/* api callbacks */
ot->invoke= mesh_select_loop_invoke;
- ot->poll= ED_operator_editmesh_view3d;
+ ot->poll= ED_operator_editmesh_region_view3d;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
Modified: trunk/blender/source/blender/editors/mesh/loopcut.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/loopcut.c 2010-09-27 05:23:23 UTC (rev 32139)
+++ trunk/blender/source/blender/editors/mesh/loopcut.c 2010-09-27 05:44:15 UTC (rev 32140)
@@ -506,7 +506,7 @@
ot->invoke= ringcut_invoke;
ot->modal= ringcut_modal;
ot->cancel= ringcut_cancel;
- ot->poll= ED_operator_editmesh_view3d;
+ ot->poll= ED_operator_editmesh_region_view3d;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_BLOCKING;
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2010-09-27 05:23:23 UTC (rev 32139)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2010-09-27 05:44:15 UTC (rev 32140)
@@ -215,6 +215,11 @@
return ED_operator_editmesh(C) && ED_operator_view3d_active(C);
}
+int ED_operator_editmesh_region_view3d(bContext *C)
+{
+ return ED_operator_editmesh(C) && CTX_wm_region_view3d(C);
+}
+
int ED_operator_editarmature(bContext *C)
{
Object *obedit= CTX_data_edit_object(C);
More information about the Bf-blender-cvs
mailing list