diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-12-08 14:42:11 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-08 14:42:11 +0300 |
commit | 1622385445d86210750e0a299971454904a891c1 (patch) | |
tree | d4ba9a09045ba4678781cd07289b1de9e30a513f /source/blender | |
parent | 40af167b0986edb02a5c151dfe785e8ab0aa6548 (diff) |
pedantic word ordering change.
- wm.add_modal_handler -> modal_handler_add
- wm.add_fileselect -> fileselect_add
- ob.add_shape_key -> shape_key_add
- VIEW3D_OT_add_background_image -> VIEW3D_OT_background_image_add (same for remove)
Also made 2 internal cmake vars hidden.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/interface/interface.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_edit.c | 26 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_ops.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object_api.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_wm_api.c | 6 |
7 files changed, 25 insertions, 25 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index deec9927d61..bc1133313ee 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1357,9 +1357,9 @@ void ui_set_but_val(uiBut *but, double value) break; case PROP_INT: if(RNA_property_array_length(&but->rnapoin, prop)) - RNA_property_int_set_index(&but->rnapoin, prop, but->rnaindex, value); + RNA_property_int_set_index(&but->rnapoin, prop, but->rnaindex, (int)value); else - RNA_property_int_set(&but->rnapoin, prop, value); + RNA_property_int_set(&but->rnapoin, prop, (int)value); break; case PROP_FLOAT: if(RNA_property_array_length(&but->rnapoin, prop)) diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 5bd9e90a208..d9f0ea07cce 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -480,7 +480,7 @@ static void view3d_dropboxes(void) WM_dropbox_add(lb, "OBJECT_OT_add_named_cursor", view3d_ob_drop_poll, view3d_ob_drop_copy); WM_dropbox_add(lb, "OBJECT_OT_drop_named_material", view3d_mat_drop_poll, view3d_id_drop_copy); WM_dropbox_add(lb, "MESH_OT_drop_named_image", view3d_ima_ob_drop_poll, view3d_id_path_drop_copy); - WM_dropbox_add(lb, "VIEW3D_OT_add_background_image", view3d_ima_bg_drop_poll, view3d_id_path_drop_copy); + WM_dropbox_add(lb, "VIEW3D_OT_background_image_add", view3d_ima_bg_drop_poll, view3d_id_path_drop_copy); } diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 59453707361..cfe4dc55d17 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -2202,7 +2202,7 @@ void VIEW3D_OT_view_persportho(wmOperatorType *ot) /* ******************** add background image operator **************** */ -static BGpic *add_background_image(bContext *C) +static BGpic *background_image_add(bContext *C) { View3D *v3d= CTX_wm_view3d(C); @@ -2218,14 +2218,14 @@ static BGpic *add_background_image(bContext *C) return bgpic; } -static int add_background_image_exec(bContext *C, wmOperator *UNUSED(op)) +static int background_image_add_exec(bContext *C, wmOperator *UNUSED(op)) { - add_background_image(C); + background_image_add(C); return OPERATOR_FINISHED; } -static int add_background_image_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) +static int background_image_add_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)) { View3D *v3d= CTX_wm_view3d(C); Image *ima= NULL; @@ -2244,7 +2244,7 @@ static int add_background_image_invoke(bContext *C, wmOperator *op, wmEvent *UNU ima= (Image *)find_id("IM", name); } - bgpic = add_background_image(C); + bgpic = background_image_add(C); if (ima) { bgpic->ima = ima; @@ -2261,16 +2261,16 @@ static int add_background_image_invoke(bContext *C, wmOperator *op, wmEvent *UNU return OPERATOR_FINISHED; } -void VIEW3D_OT_add_background_image(wmOperatorType *ot) +void VIEW3D_OT_background_image_add(wmOperatorType *ot) { /* identifiers */ ot->name = "Add Background Image"; ot->description= "Add a new background image"; - ot->idname = "VIEW3D_OT_add_background_image"; + ot->idname = "VIEW3D_OT_background_image_add"; /* api callbacks */ - ot->invoke = add_background_image_invoke; - ot->exec = add_background_image_exec; + ot->invoke = background_image_add_invoke; + ot->exec = background_image_add_exec; ot->poll = ED_operator_view3d_active; /* flags */ @@ -2283,7 +2283,7 @@ void VIEW3D_OT_add_background_image(wmOperatorType *ot) /* ***** remove image operator ******* */ -static int remove_background_image_exec(bContext *C, wmOperator *op) +static int background_image_remove_exec(bContext *C, wmOperator *op) { BGpic *bgpic_rem = CTX_data_pointer_get_type(C, "bgpic", &RNA_BackgroundImage).data; View3D *vd = CTX_wm_view3d(C); @@ -2301,15 +2301,15 @@ static int remove_background_image_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -void VIEW3D_OT_remove_background_image(wmOperatorType *ot) +void VIEW3D_OT_background_image_remove(wmOperatorType *ot) { /* identifiers */ ot->name = "Remove Background Image"; ot->description= "Remove a background image from the 3D view"; - ot->idname = "VIEW3D_OT_remove_background_image"; + ot->idname = "VIEW3D_OT_background_image_remove"; /* api callbacks */ - ot->exec = remove_background_image_exec; + ot->exec = background_image_remove_exec; ot->poll = ED_operator_view3d_active; /* flags */ diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 445a83b4266..83ef57cfd0f 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -78,8 +78,8 @@ void VIEW3D_OT_view_center_cursor(struct wmOperatorType *ot); void VIEW3D_OT_view_center_camera(struct wmOperatorType *ot); void VIEW3D_OT_view_pan(struct wmOperatorType *ot); void VIEW3D_OT_view_persportho(struct wmOperatorType *ot); -void VIEW3D_OT_add_background_image(struct wmOperatorType *ot); -void VIEW3D_OT_remove_background_image(struct wmOperatorType *ot); +void VIEW3D_OT_background_image_add(struct wmOperatorType *ot); +void VIEW3D_OT_background_image_remove(struct wmOperatorType *ot); void VIEW3D_OT_view_orbit(struct wmOperatorType *ot); void VIEW3D_OT_clip_border(struct wmOperatorType *ot); void VIEW3D_OT_cursor3d(struct wmOperatorType *ot); diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c index 9ee12a8ef1e..7a25d23b56b 100644 --- a/source/blender/editors/space_view3d/view3d_ops.c +++ b/source/blender/editors/space_view3d/view3d_ops.c @@ -62,8 +62,8 @@ void view3d_operatortypes(void) WM_operatortype_append(VIEW3D_OT_view_orbit); WM_operatortype_append(VIEW3D_OT_view_pan); WM_operatortype_append(VIEW3D_OT_view_persportho); - WM_operatortype_append(VIEW3D_OT_add_background_image); - WM_operatortype_append(VIEW3D_OT_remove_background_image); + WM_operatortype_append(VIEW3D_OT_background_image_add); + WM_operatortype_append(VIEW3D_OT_background_image_remove); WM_operatortype_append(VIEW3D_OT_view_selected); WM_operatortype_append(VIEW3D_OT_view_center_cursor); WM_operatortype_append(VIEW3D_OT_view_center_camera); diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c index af77c55dbf9..96f24c4ecc9 100644 --- a/source/blender/makesrna/intern/rna_object_api.c +++ b/source/blender/makesrna/intern/rna_object_api.c @@ -281,7 +281,7 @@ static void rna_Object_update(Object *ob, Scene *sce, int object, int data, int DAG_id_tag_update(&ob->id, flag); } -static PointerRNA rna_Object_add_shape_key(Object *ob, bContext *C, ReportList *reports, const char *name, int from_mix) +static PointerRNA rna_Object_shape_key_add(Object *ob, bContext *C, ReportList *reports, const char *name, int from_mix) { Scene *scene= CTX_data_scene(C); KeyBlock *kb= NULL; @@ -431,7 +431,7 @@ void RNA_api_object(StructRNA *srna) RNA_def_function_return(func, parm); /* Shape key */ - func= RNA_def_function(srna, "add_shape_key", "rna_Object_add_shape_key"); + func= RNA_def_function(srna, "shape_key_add", "rna_Object_shape_key_add"); RNA_def_function_ui_description(func, "Add shape key to an object."); RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS); parm= RNA_def_string(func, "name", "Key", 0, "", "Unique name for the new keylock."); /* optional */ diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index 5aa68bc6d4e..9c5b8d0740a 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -63,7 +63,7 @@ static void rna_Operator_enum_search_invoke(bContext *C, wmOperator *op) } -static int rna_event_add_modal_handler(struct bContext *C, struct wmOperator *operator) +static int rna_event_modal_handler_add(struct bContext *C, struct wmOperator *operator) { return WM_event_add_modal_handler(C, operator) != NULL; } @@ -104,11 +104,11 @@ void RNA_api_wm(StructRNA *srna) FunctionRNA *func; PropertyRNA *parm; - func= RNA_def_function(srna, "add_fileselect", "WM_event_add_fileselect"); + func= RNA_def_function(srna, "fileselect_add", "WM_event_add_fileselect"); RNA_def_function_ui_description(func, "Show up the file selector."); rna_generic_op_invoke(func, 0); - func= RNA_def_function(srna, "add_modal_handler", "rna_event_add_modal_handler"); + func= RNA_def_function(srna, "modal_handler_add", "rna_event_modal_handler_add"); RNA_def_function_flag(func, FUNC_NO_SELF|FUNC_USE_CONTEXT); parm= RNA_def_pointer(func, "operator", "Operator", "", "Operator to call."); RNA_def_property_flag(parm, PROP_REQUIRED); |