Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-11-18 04:20:28 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-11-18 04:22:00 +0300
commita374ff16b5e823ae37b69eb1995d36944b80c57f (patch)
treeddf35381dbff2df8d39a4d9a809f4102706b5f4f /source/blender/editors/object
parenteab00634812baf38b5b6535d72284236785dccd5 (diff)
Cleanup: editor api naming
- use ED_ prefix for api calls - use ED_*_select_pick for mouse selection (was already done in parts)
Diffstat (limited to 'source/blender/editors/object')
-rw-r--r--source/blender/editors/object/object_add.c4
-rw-r--r--source/blender/editors/object/object_edit.c24
-rw-r--r--source/blender/editors/object/object_hook.c4
-rw-r--r--source/blender/editors/object/object_lattice.c20
4 files changed, 26 insertions, 26 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 2cead58300d..77230831a65 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -516,7 +516,7 @@ static int effector_add_exec(bContext *C, wmOperator *op)
cu->flag |= CU_PATH | CU_3D;
ED_object_editmode_enter(C, 0);
ED_object_new_primitive_matrix(C, ob, loc, rot, mat);
- BLI_addtail(&cu->editnurb->nurbs, add_nurbs_primitive(C, ob, mat, CU_NURBS | CU_PRIM_PATH, dia));
+ BLI_addtail(&cu->editnurb->nurbs, ED_curve_add_nurbs_primitive(C, ob, mat, CU_NURBS | CU_PRIM_PATH, dia));
if (!enter_editmode)
ED_object_editmode_exit(C, EM_FREEDATA);
}
@@ -641,7 +641,7 @@ static int object_metaball_add_exec(bContext *C, wmOperator *op)
ED_object_new_primitive_matrix(C, obedit, loc, rot, mat);
dia = RNA_float_get(op->ptr, "radius");
- add_metaball_primitive(C, obedit, mat, dia, RNA_enum_get(op->ptr, "type"));
+ ED_mball_add_primitive(C, obedit, mat, dia, RNA_enum_get(op->ptr, "type"));
/* userdef */
if (newob && !enter_editmode) {
diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index 9b7563ae729..fa58e6972c4 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -356,20 +356,20 @@ static bool ED_object_editmode_load_ex(Main *bmain, Object *obedit, const bool f
DAG_relations_tag_update(bmain);
}
else if (ELEM(obedit->type, OB_CURVE, OB_SURF)) {
- load_editNurb(obedit);
- if (freedata) free_editNurb(obedit);
+ ED_curve_editnurb_load(obedit);
+ if (freedata) ED_curve_editnurb_free(obedit);
}
else if (obedit->type == OB_FONT) {
- load_editText(obedit);
- if (freedata) free_editText(obedit);
+ ED_curve_editfont_load(obedit);
+ if (freedata) ED_curve_editfont_free(obedit);
}
else if (obedit->type == OB_LATTICE) {
- load_editLatt(obedit);
- if (freedata) free_editLatt(obedit);
+ ED_lattice_editlatt_load(obedit);
+ if (freedata) ED_lattice_editlatt_free(obedit);
}
else if (obedit->type == OB_MBALL) {
- load_editMball(obedit);
- if (freedata) free_editMball(obedit);
+ ED_mball_editmball_load(obedit);
+ if (freedata) ED_mball_editmball_free(obedit);
}
/* Tag update so no access to freed data referenced from
@@ -532,28 +532,28 @@ void ED_object_editmode_enter(bContext *C, int flag)
else if (ob->type == OB_FONT) {
scene->obedit = ob; /* XXX for context */
ok = 1;
- make_editText(ob);
+ ED_curve_editfont_make(ob);
WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_TEXT, scene);
}
else if (ob->type == OB_MBALL) {
scene->obedit = ob; /* XXX for context */
ok = 1;
- make_editMball(ob);
+ ED_mball_editmball_make(ob);
WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_MBALL, scene);
}
else if (ob->type == OB_LATTICE) {
scene->obedit = ob; /* XXX for context */
ok = 1;
- make_editLatt(ob);
+ ED_lattice_editlatt_make(ob);
WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_LATTICE, scene);
}
else if (ob->type == OB_SURF || ob->type == OB_CURVE) {
ok = 1;
scene->obedit = ob; /* XXX for context */
- make_editNurb(ob);
+ ED_curve_editnurb_make(ob);
WM_event_add_notifier(C, NC_SCENE | ND_MODE | NS_EDITMODE_CURVE, scene);
}
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 03984b7a528..6a1220bbbaa 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -333,8 +333,8 @@ static bool object_hook_index_array(Scene *scene, Object *obedit,
}
case OB_CURVE:
case OB_SURF:
- load_editNurb(obedit);
- make_editNurb(obedit);
+ ED_curve_editnurb_load(obedit);
+ ED_curve_editnurb_make(obedit);
return return_editcurve_indexar(obedit, r_tot, r_indexar, r_cent);
case OB_LATTICE:
{
diff --git a/source/blender/editors/object/object_lattice.c b/source/blender/editors/object/object_lattice.c
index 410b15581df..617c84fb005 100644
--- a/source/blender/editors/object/object_lattice.c
+++ b/source/blender/editors/object/object_lattice.c
@@ -72,7 +72,7 @@
/********************** Load/Make/Free ********************/
-void free_editLatt(Object *ob)
+void ED_lattice_editlatt_free(Object *ob)
{
Lattice *lt = ob->data;
@@ -91,12 +91,12 @@ void free_editLatt(Object *ob)
}
}
-void make_editLatt(Object *obedit)
+void ED_lattice_editlatt_make(Object *obedit)
{
Lattice *lt = obedit->data;
KeyBlock *actkey;
- free_editLatt(obedit);
+ ED_lattice_editlatt_free(obedit);
actkey = BKE_keyblock_from_object(obedit);
if (actkey)
@@ -115,7 +115,7 @@ void make_editLatt(Object *obedit)
if (lt->key) lt->editlatt->shapenr = obedit->shapenr;
}
-void load_editLatt(Object *obedit)
+void ED_lattice_editlatt_load(Object *obedit)
{
Lattice *lt, *editlt;
KeyBlock *actkey;
@@ -415,7 +415,7 @@ void LATTICE_OT_select_less(wmOperatorType *ot)
/************************** Select All Operator *************************/
-void ED_setflagsLatt(Object *obedit, int flag)
+void ED_lattice_flags_set(Object *obedit, int flag)
{
Lattice *lt = obedit->data;
BPoint *bp;
@@ -461,10 +461,10 @@ static int lattice_select_all_exec(bContext *C, wmOperator *op)
switch (action) {
case SEL_SELECT:
- ED_setflagsLatt(obedit, 1);
+ ED_lattice_flags_set(obedit, 1);
break;
case SEL_DESELECT:
- ED_setflagsLatt(obedit, 0);
+ ED_lattice_flags_set(obedit, 0);
break;
case SEL_INVERT:
bp = lt->editlatt->latt->def;
@@ -518,7 +518,7 @@ static int lattice_select_ungrouped_exec(bContext *C, wmOperator *op)
}
if (!RNA_boolean_get(op->ptr, "extend")) {
- ED_setflagsLatt(obedit, 0);
+ ED_lattice_flags_set(obedit, 0);
}
dv = lt->dvert;
@@ -867,7 +867,7 @@ static BPoint *findnearestLattvert(ViewContext *vc, const int mval[2], int sel)
return data.bp;
}
-bool mouse_lattice(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
+bool ED_lattice_select_pick(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
{
ViewContext vc;
BPoint *bp = NULL;
@@ -888,7 +888,7 @@ bool mouse_lattice(bContext *C, const int mval[2], bool extend, bool deselect, b
bp->f1 ^= SELECT; /* swap */
}
else {
- ED_setflagsLatt(vc.obedit, 0);
+ ED_lattice_flags_set(vc.obedit, 0);
bp->f1 |= SELECT;
}