[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25536] trunk/blender/source/blender: fix for a crash when running blender in debug mode (-d arg), was registering every operator in debug mode.
Campbell Barton
ideasman42 at gmail.com
Wed Dec 23 16:06:48 CET 2009
Revision: 25536
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25536
Author: campbellbarton
Date: 2009-12-23 16:06:47 +0100 (Wed, 23 Dec 2009)
Log Message:
-----------
fix for a crash when running blender in debug mode (-d arg), was registering every operator in debug mode.
added some more sculpt key shortcuts
* R toggles rake
* Shift+A toggles airbrush
note: last commit added Ctrl+0 to set zero subsurf and multires
Modified Paths:
--------------
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c 2009-12-23 12:13:48 UTC (rev 25535)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c 2009-12-23 15:06:47 UTC (rev 25536)
@@ -214,6 +214,12 @@
kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", SKEY, KM_PRESS, KM_SHIFT, 0);
RNA_string_set(kmi->ptr, "path", "tool_settings.sculpt.brush.use_smooth_stroke");
+ kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", RKEY, KM_PRESS, 0, 0);
+ RNA_string_set(kmi->ptr, "path", "tool_settings.sculpt.brush.use_rake");
+
+ kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", AKEY, KM_PRESS, KM_SHIFT, 0);
+ RNA_string_set(kmi->ptr, "path", "tool_settings.sculpt.brush.use_airbrush");
+
/* brush switching */
kmi = WM_keymap_add_item(keymap, "WM_OT_context_set_enum", DKEY, KM_PRESS, 0, 0);
RNA_string_set(kmi->ptr, "path", "tool_settings.sculpt.brush.sculpt_tool");
Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2009-12-23 12:13:48 UTC (rev 25535)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c 2009-12-23 15:06:47 UTC (rev 25536)
@@ -316,7 +316,13 @@
ED_undo_push_op(C, op);
if(repeat==0) {
- if((op->type->flag & OPTYPE_REGISTER) || (G.f & G_DEBUG))
+ if(G.f & G_DEBUG) {
+ char *buf = WM_operator_pystring(C, op->type, op->ptr, 1);
+ BKE_report(CTX_wm_reports(C), RPT_OPERATOR, buf);
+ MEM_freeN(buf);
+ }
+
+ if((op->type->flag & OPTYPE_REGISTER))
wm_operator_register(C, op);
else
WM_operator_free(op);
@@ -450,7 +456,13 @@
if(ot->flag & OPTYPE_UNDO)
ED_undo_push_op(C, op);
- if((ot->flag & OPTYPE_REGISTER) || (G.f & G_DEBUG))
+ if(G.f & G_DEBUG) {
+ char *buf = WM_operator_pystring(C, op->type, op->ptr, 1);
+ BKE_report(CTX_wm_reports(C), RPT_OPERATOR, buf);
+ MEM_freeN(buf);
+ }
+
+ if((ot->flag & OPTYPE_REGISTER))
wm_operator_register(C, op);
else
WM_operator_free(op);
@@ -899,7 +911,13 @@
if(ot->flag & OPTYPE_UNDO)
ED_undo_push_op(C, op);
- if((ot->flag & OPTYPE_REGISTER) || (G.f & G_DEBUG))
+ if(G.f & G_DEBUG) {
+ char *buf = WM_operator_pystring(C, op->type, op->ptr, 1);
+ BKE_report(CTX_wm_reports(C), RPT_OPERATOR, buf);
+ MEM_freeN(buf);
+ }
+
+ if((ot->flag & OPTYPE_REGISTER))
wm_operator_register(C, op);
else
WM_operator_free(op);
More information about the Bf-blender-cvs
mailing list