Revision: 41327
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41327
Author: campbellbarton
Date: 2011-10-28 03:02:09 +0000 (Fri, 28 Oct 2011)
Log Message:
-----------
prefix common internal operator function names so its possible to assign them
breakpoints.
Modified Paths:
--------------
trunk/blender/source/blender/editors/curve/editfont.c
trunk/blender/source/blender/editors/mesh/editmesh_mods.c
trunk/blender/source/blender/editors/metaball/mball_edit.c
trunk/blender/source/blender/editors/object/object_lattice.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sound/sound_ops.c
trunk/blender/source/blender/editors/space_console/console_ops.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_text/text_header.c
trunk/blender/source/blender/editors/space_text/text_ops.c
Modified: trunk/blender/source/blender/editors/curve/editfont.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editfont.c 2011-10-28
02:10:02 UTC (rev 41326)
+++ trunk/blender/source/blender/editors/curve/editfont.c 2011-10-28
03:02:09 UTC (rev 41327)
@@ -1654,14 +1654,14 @@
uiIDContextProperty(C, &pprop->ptr, &pprop->prop);
}
-static int open_cancel(bContext *UNUSED(C), wmOperator *op)
+static int font_open_cancel(bContext *UNUSED(C), wmOperator *op)
{
MEM_freeN(op->customdata);
op->customdata= NULL;
return OPERATOR_CANCELLED;
}
-static int open_exec(bContext *C, wmOperator *op)
+static int font_open_exec(bContext *C, wmOperator *op)
{
struct Main *bmain= CTX_data_main(C);
VFont *font;
@@ -1719,7 +1719,7 @@
path = (font && strcmp(font->name, FO_BUILTIN_NAME) != 0)? font->name:
U.fontdir;
if(RNA_property_is_set(op->ptr, "filepath"))
- return open_exec(C, op);
+ return font_open_exec(C, op);
RNA_string_set(op->ptr, "filepath", path);
WM_event_add_fileselect(C, op);
@@ -1734,9 +1734,9 @@
ot->idname= "FONT_OT_open";
/* api callbacks */
- ot->exec= open_exec;
+ ot->exec= font_open_exec;
ot->invoke= open_invoke;
- ot->cancel= open_cancel;
+ ot->cancel= font_open_cancel;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
Modified: trunk/blender/source/blender/editors/mesh/editmesh_mods.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2011-10-28
02:10:02 UTC (rev 41326)
+++ trunk/blender/source/blender/editors/mesh/editmesh_mods.c 2011-10-28
03:02:09 UTC (rev 41327)
@@ -3435,7 +3435,7 @@
EM_clear_flag_all(em, SELECT);
}
-static int select_all_exec(bContext *C, wmOperator *op)
+static int editmesh_select_all_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
EditMesh *em= BKE_mesh_get_editmesh(((Mesh *)obedit->data));
@@ -3470,7 +3470,7 @@
ot->idname= "MESH_OT_select_all";
/* api callbacks */
- ot->exec= select_all_exec;
+ ot->exec= editmesh_select_all_exec;
ot->poll= ED_operator_editmesh;
/* flags */
Modified: trunk/blender/source/blender/editors/metaball/mball_edit.c
===================================================================
--- trunk/blender/source/blender/editors/metaball/mball_edit.c 2011-10-28
02:10:02 UTC (rev 41326)
+++ trunk/blender/source/blender/editors/metaball/mball_edit.c 2011-10-28
03:02:09 UTC (rev 41327)
@@ -121,7 +121,7 @@
/***************************** Select/Deselect operator
*****************************/
/* Select or deselect all MetaElements */
-static int select_all_exec(bContext *C, wmOperator *op)
+static int mball_select_all_exec(bContext *C, wmOperator *op)
{
//Scene *scene= CTX_data_scene(C);
Object *obedit= CTX_data_edit_object(C);
@@ -171,7 +171,7 @@
ot->idname= "MBALL_OT_select_all";
/* callback functions */
- ot->exec= select_all_exec;
+ ot->exec= mball_select_all_exec;
ot->poll= ED_operator_editmball;
/* flags */
Modified: trunk/blender/source/blender/editors/object/object_lattice.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_lattice.c
2011-10-28 02:10:02 UTC (rev 41326)
+++ trunk/blender/source/blender/editors/object/object_lattice.c
2011-10-28 03:02:09 UTC (rev 41327)
@@ -186,7 +186,7 @@
}
}
-static int select_all_exec(bContext *C, wmOperator *op)
+static int lattice_select_all_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
Lattice *lt= obedit->data;
@@ -244,7 +244,7 @@
ot->idname= "LATTICE_OT_select_all";
/* api callbacks */
- ot->exec= select_all_exec;
+ ot->exec= lattice_select_all_exec;
ot->poll= ED_operator_editlattice;
/* flags */
Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c
2011-10-28 02:10:02 UTC (rev 41326)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c
2011-10-28 03:02:09 UTC (rev 41327)
@@ -1296,7 +1296,7 @@
/************************ de select all operator ************************/
-static int select_all_exec(bContext *C, wmOperator *op)
+static int pe_select_all_exec(bContext *C, wmOperator *op)
{
Scene *scene= CTX_data_scene(C);
Object *ob= CTX_data_active_object(C);
@@ -1358,7 +1358,7 @@
ot->idname= "PARTICLE_OT_select_all";
/* api callbacks */
- ot->exec= select_all_exec;
+ ot->exec= pe_select_all_exec;
ot->poll= PE_poll;
/* flags */
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2011-10-28 02:10:02 UTC (rev 41326)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2011-10-28 03:02:09 UTC (rev 41327)
@@ -5583,7 +5583,7 @@
if(h > maxsize) h= maxsize;
ibuf= ED_view3d_draw_offscreen_imbuf(CTX_data_scene(C),
CTX_wm_view3d(C), CTX_wm_region(C), w, h, IB_rect, err_out);
- if(!ibuf) {
+ if(!ibuf || 1) {
/* Mostly happens when OpenGL offscreen buffer was failed to
create, */
/* but could be other reasons. Should be handled in the future.
nazgul */
BKE_reportf(op->reports, RPT_ERROR, "Failed to create OpenGL
offscreen buffer: %s", err_out);
Modified: trunk/blender/source/blender/editors/sound/sound_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sound/sound_ops.c 2011-10-28
02:10:02 UTC (rev 41326)
+++ trunk/blender/source/blender/editors/sound/sound_ops.c 2011-10-28
03:02:09 UTC (rev 41327)
@@ -77,14 +77,14 @@
/******************** open sound operator ********************/
-static int open_cancel(bContext *UNUSED(C), wmOperator *op)
+static int sound_open_cancel(bContext *UNUSED(C), wmOperator *op)
{
MEM_freeN(op->customdata);
op->customdata= NULL;
return OPERATOR_CANCELLED;
}
-static void open_init(bContext *C, wmOperator *op)
+static void sound_open_init(bContext *C, wmOperator *op)
{
PropertyPointerRNA *pprop;
@@ -93,7 +93,7 @@
}
#ifdef WITH_AUDASPACE
-static int open_exec(bContext *C, wmOperator *op)
+static int sound_open_exec(bContext *C, wmOperator *op)
{
char path[FILE_MAX];
bSound *sound;
@@ -106,7 +106,7 @@
sound = sound_new_file(bmain, path);
if(!op->customdata)
- open_init(C, op);
+ sound_open_init(C, op);
if (sound==NULL || sound->playback_handle == NULL) {
if(op->customdata) MEM_freeN(op->customdata);
@@ -151,7 +151,7 @@
#else //WITH_AUDASPACE
-static int open_exec(bContext *UNUSED(C), wmOperator *op)
+static int sound_open_exec(bContext *UNUSED(C), wmOperator *op)
{
BKE_report(op->reports, RPT_ERROR, "Compiled without sound support");
@@ -160,12 +160,12 @@
#endif
-static int open_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int sound_open_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
if(RNA_property_is_set(op->ptr, "filepath"))
- return open_exec(C, op);
+ return sound_open_exec(C, op);
- open_init(C, op);
+ sound_open_init(C, op);
return WM_operator_filesel(C, op, event);
}
@@ -178,9 +178,9 @@
ot->idname= "SOUND_OT_open";
/* api callbacks */
- ot->exec= open_exec;
- ot->invoke= open_invoke;
- ot->cancel= open_cancel;
+ ot->exec= sound_open_exec;
+ ot->invoke= sound_open_invoke;
+ ot->cancel= sound_open_cancel;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -199,9 +199,9 @@
ot->idname= "SOUND_OT_open_mono";
/* api callbacks */
- ot->exec= open_exec;
- ot->invoke= open_invoke;
- ot->cancel= open_cancel;
+ ot->exec= sound_open_exec;
+ ot->invoke= sound_open_invoke;
+ ot->cancel= sound_open_cancel;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
@@ -214,7 +214,7 @@
/******************** mixdown operator ********************/
-static int mixdown_exec(bContext *C, wmOperator *op)
+static int sound_mixdown_exec(bContext *C, wmOperator *op)
{
#ifdef WITH_AUDASPACE
char path[FILE_MAX];
@@ -257,15 +257,15 @@
return OPERATOR_FINISHED;
}
-static int mixdown_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int sound_mixdown_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
if(RNA_property_is_set(op->ptr, "filepath"))
- return mixdown_exec(C, op);
+ return sound_mixdown_exec(C, op);
return WM_operator_filesel(C, op, event);
}
-static int mixdown_draw_check_prop(PropertyRNA *prop)
+static int sound_mixdown_draw_check_prop(PropertyRNA *prop)
{
const char *prop_id= RNA_property_identifier(prop);
return !( strcmp(prop_id, "filepath") == 0 ||
@@ -275,7 +275,7 @@
}
#ifdef WITH_AUDASPACE
-static void mixdown_draw(bContext *C, wmOperator *op)
+static void sound_mixdown_draw(bContext *C, wmOperator *op)
{
static EnumPropertyItem pcm_format_items[] = {
{AUD_FORMAT_U8, "U8", 0, "U8", "8 bit unsigned"},
@@ -424,7 +424,7 @@
RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr);
/* main draw call */
- uiDefAutoButsRNA(layout, &ptr, mixdown_draw_check_prop, '\0');
+ uiDefAutoButsRNA(layout, &ptr, sound_mixdown_draw_check_prop, '\0');
}
#endif // WITH_AUDASPACE
@@ -476,11 +476,11 @@
ot->idname= "SOUND_OT_mixdown";
/* api callbacks */
- ot->exec= mixdown_exec;
- ot->invoke= mixdown_invoke;
+ ot->exec= sound_mixdown_exec;
+ ot->invoke= sound_mixdown_invoke;
#ifdef WITH_AUDASPACE
- ot->ui= mixdown_draw;
+ ot->ui= sound_mixdown_draw;
#endif
/* flags */
ot->flag= OPTYPE_REGISTER;
@@ -509,7 +509,7 @@
}
/********************* pack operator *********************/
-static int pack_exec(bContext *C, wmOperator *op)
+static int sound_pack_exec(bContext *C, wmOperator *op)
{
Main *bmain= CTX_data_main(C);
Editing* ed = CTX_data_scene(C)->ed;
@@ -537,7 +537,7 @@
ot->idname= "SOUND_OT_pack";
/* api callbacks */
- ot->exec= pack_exec;
+ ot->exec= sound_pack_exec;
ot->poll= sound_poll;
/* flags */
@@ -615,7 +615,7 @@
/* ******************************************************* */
-static int update_animation_flags_exec(bContext *C, wmOperator *UNUSED(op))
+static int sound_update_animation_flags_exec(bContext *C, wmOperator
*UNUSED(op))
{
Sequence* seq;
Scene* scene = CTX_data_scene(C);
@@ -667,7 +667,7 @@
ot->idname= "SOUND_OT_update_animation_flags";
/* api callbacks */
- ot->exec= update_animation_flags_exec;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
