blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 745 Projects 19 Wiki Activity

Cleanup: editor api naming 

- use ED_ prefix for api calls
- use ED_*_select_pick for mouse selection (was already done in parts)
This commit is contained in:
Campbell Barton 2015-11-18 12:20:28 +11:00
parent eab0063481
commit a374ff16b5
17 changed files with 90 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/armature/armature_select.c
View File

@ -425,7 +425,7 @@ static int ebone_select_flag(EditBone *ebone)
}
/* context: editmode armature in view3d */
bool mouse_armature(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
bool ED_armature_select_pick(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
{
Object *obedit = CTX_data_edit_object(C);
bArmature *arm = obedit->data;

14
source/blender/editors/curve/editcurve.c
View File

@ -1178,7 +1178,7 @@ static void remap_hooks_and_vertex_parents(Object *obedit)
}
/* load editNurb in object */
void load_editNurb(Object *obedit)
void ED_curve_editnurb_load(Object *obedit)
{
ListBase *editnurb = object_editcurve_get(obedit);
@ -1210,7 +1210,7 @@ void load_editNurb(Object *obedit)
}
/* make copy in cu->editnurb */
void make_editNurb(Object *obedit)
void ED_curve_editnurb_make(Object *obedit)
{
Curve *cu = (Curve *)obedit->data;
EditNurb *editnurb = cu->editnurb;
@ -1253,7 +1253,7 @@ void make_editNurb(Object *obedit)
}
}
void free_editNurb(Object *obedit)
void ED_curve_editnurb_free(Object *obedit)
{
Curve *cu = obedit->data;
@ -1302,7 +1302,7 @@ static int separate_exec(bContext *C, wmOperator *op)
id_us_min(&oldcu->id); /* because new curve is a copy: reduce user count */
/* 3. put new object in editmode, clear it and set separated nurbs */
make_editNurb(newob);
ED_curve_editnurb_make(newob);
newedit = newcu->editnurb;
BKE_nurbList_free(&newedit->nurbs);
BKE_curve_editNurb_keyIndex_free(newedit);
@ -1310,8 +1310,8 @@ static int separate_exec(bContext *C, wmOperator *op)
BLI_movelisttolist(&newedit->nurbs, &newnurb);
/* 4. put old object out of editmode and delete separated geometry */
load_editNurb(newob);
free_editNurb(newob);
ED_curve_editnurb_load(newob);
ED_curve_editnurb_free(newob);
curve_delete_segments(oldob, true);
DAG_id_tag_update(&oldob->id, OB_RECALC_DATA); /* this is the original one */
@ -4164,7 +4164,7 @@ void CURVE_OT_make_segment(wmOperatorType *ot)
/***************** pick select from 3d view **********************/
bool mouse_nurb(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
bool ED_curve_editnurb_select_pick(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
{
Object *obedit = CTX_data_edit_object(C);
Curve *cu = obedit->data;

8
source/blender/editors/curve/editcurve_add.c
View File

@ -105,7 +105,7 @@ static const char *get_surf_defname(int type)
}
Nurb *add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], int type, int newob)
Nurb *ED_curve_add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], int type, int newob)
{
static int xzproj = 0; /* this function calls itself... */
ListBase *editnurb = object_editcurve_get(obedit);
@ -346,7 +346,7 @@ Nurb *add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], int type
break;
case CU_PRIM_TUBE: /* Cylinder */
if (cutype == CU_NURBS) {
nu = add_nurbs_primitive(C, obedit, mat, CU_NURBS | CU_PRIM_CIRCLE, 0); /* circle */
nu = ED_curve_add_nurbs_primitive(C, obedit, mat, CU_NURBS | CU_PRIM_CIRCLE, 0); /* circle */
nu->resolu = cu->resolu;
nu->flag = CU_SMOOTH;
BLI_addtail(editnurb, nu); /* temporal for extrude and translate */
@ -423,7 +423,7 @@ Nurb *add_nurbs_primitive(bContext *C, Object *obedit, float mat[4][4], int type
float tmp_vec[3] = {0.f, 0.f, 1.f};
xzproj = 1;
nu = add_nurbs_primitive(C, obedit, mat, CU_NURBS | CU_PRIM_CIRCLE, 0); /* circle */
nu = ED_curve_add_nurbs_primitive(C, obedit, mat, CU_NURBS | CU_PRIM_CIRCLE, 0); /* circle */
xzproj = 0;
nu->resolu = cu->resolu;
nu->resolv = cu->resolv;
@ -523,7 +523,7 @@ static int curvesurf_prim_add(bContext *C, wmOperator *op, int type, int isSurf)
dia = RNA_float_get(op->ptr, "radius");
mul_mat3_m4_fl(mat, dia);
nu = add_nurbs_primitive(C, obedit, mat, type, newob);
nu = ED_curve_add_nurbs_primitive(C, obedit, mat, type, newob);
editnurb = object_editcurve_get(obedit);
BLI_addtail(editnurb, nu);

8
source/blender/editors/curve/editfont.c
View File

@ -1510,7 +1510,7 @@ void FONT_OT_textbox_remove(wmOperatorType *ot)
/***************** editmode enter/exit ********************/
void make_editText(Object *obedit)
void ED_curve_editfont_make(Object *obedit)
{
Curve *cu = obedit->data;
EditFont *ef = cu->editfont;
@ -1546,7 +1546,7 @@ void make_editText(Object *obedit)
BKE_vfont_select_clamp(obedit);
}
void load_editText(Object *obedit)
void ED_curve_editfont_load(Object *obedit)
{
Curve *cu = obedit->data;
EditFont *ef = cu->editfont;
@ -1575,7 +1575,7 @@ void load_editText(Object *obedit)
cu->selend = ef->selend;
}
void free_editText(Object *obedit)
void ED_curve_editfont_free(Object *obedit)
{
BKE_curve_editfont_free((Curve *)obedit->data);
}
@ -1886,7 +1886,7 @@ void undo_push_font(bContext *C, const char *name)
/**
* TextBox selection
*/
bool mouse_font(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
bool ED_curve_editfont_select_pick(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
{
Object *obedit = CTX_data_edit_object(C);
Curve *cu = obedit->data;

2
source/blender/editors/include/ED_armature.h
View File

@ -128,7 +128,7 @@ void ED_armature_deselect_all_visible(struct Object *obedit);
int ED_do_pose_selectbuffer(struct Scene *scene, struct Base *base, unsigned int *buffer,
short hits, bool extend, bool deselect, bool toggle, bool do_nearest);
bool mouse_armature(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
bool ED_armature_select_pick(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
int join_armature_exec(struct bContext *C, struct wmOperator *op);
struct Bone *get_indexed_bone(struct Object *ob, int index);
float ED_rollBoneToVector(EditBone *bone, const float new_up_axis[3], const bool axis_only);

18
source/blender/editors/include/ED_curve.h
View File

@ -51,13 +51,13 @@ void ED_keymap_curve(struct wmKeyConfig *keyconf);
void undo_push_curve(struct bContext *C, const char *name);
ListBase *object_editcurve_get(struct Object *ob);
void load_editNurb(struct Object *obedit);
void make_editNurb(struct Object *obedit);
void free_editNurb(struct Object *obedit);
void ED_curve_editnurb_load(struct Object *obedit);
void ED_curve_editnurb_make(struct Object *obedit);
void ED_curve_editnurb_free(struct Object *obedit);
bool mouse_nurb(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
bool ED_curve_editnurb_select_pick(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
struct Nurb *add_nurbs_primitive(struct bContext *C, struct Object *obedit, float mat[4][4], int type, int newob);
struct Nurb *ED_curve_add_nurbs_primitive(struct bContext *C, struct Object *obedit, float mat[4][4], int type, int newob);
bool ED_curve_nurb_select_check(struct Curve *cu, struct Nurb *nu);
int ED_curve_nurb_select_count(struct Curve *cu, struct Nurb *nu);
@ -75,9 +75,9 @@ bool ED_curve_select_nth(struct Curve *cu, int nth, int skip, int offset);
/* editfont.h */
void undo_push_font(struct bContext *C, const char *name);
void make_editText(struct Object *obedit);
void load_editText(struct Object *obedit);
void free_editText(struct Object *obedit);
void ED_curve_editfont_load(struct Object *obedit);
void ED_curve_editfont_make(struct Object *obedit);
void ED_curve_editfont_free(struct Object *obedit);
void ED_text_to_object(struct bContext *C, struct Text *text, const bool split_lines);
@ -88,7 +88,7 @@ int ED_curve_updateAnimPaths(struct Curve *cu);
bool ED_curve_active_center(struct Curve *cu, float center[3]);
bool mouse_font(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
bool ED_curve_editfont_select_pick(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
#if 0
/* debug only */

6
source/blender/editors/include/ED_lattice.h
View File

@ -33,8 +33,8 @@
struct Object;
void free_editLatt(struct Object *ob);
void make_editLatt(struct Object *obedit);
void load_editLatt(struct Object *obedit);
void ED_lattice_editlatt_free(struct Object *ob);
void ED_lattice_editlatt_make(struct Object *obedit);
void ED_lattice_editlatt_load(struct Object *obedit);
#endif /* __ED_LATTICE_H__ */

10
source/blender/editors/include/ED_mball.h
View File

@ -39,13 +39,13 @@ void ED_operatortypes_metaball(void);
void ED_operatormacros_metaball(void);
void ED_keymap_metaball(struct wmKeyConfig *keyconf);
struct MetaElem *add_metaball_primitive(struct bContext *C, struct Object *obedit, float mat[4][4], float dia, int type);
struct MetaElem *ED_mball_add_primitive(struct bContext *C, struct Object *obedit, float mat[4][4], float dia, int type);
bool mouse_mball(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
bool ED_mball_select_pick(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
void free_editMball(struct Object *obedit);
void make_editMball(struct Object *obedit);
void load_editMball(struct Object *obedit);
void ED_mball_editmball_free(struct Object *obedit);
void ED_mball_editmball_make(struct Object *obedit);
void ED_mball_editmball_load(struct Object *obedit);
void undo_push_mball(struct bContext *C, const char *name);

4
source/blender/editors/include/ED_object.h
View File

@ -169,12 +169,12 @@ void ED_object_constraint_tag_update(struct Object *ob, struct bConstraint *con)
void ED_object_constraint_dependency_tag_update(struct Main *bmain, struct Object *ob, struct bConstraint *con);
/* object_lattice.c */
bool mouse_lattice(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
bool ED_lattice_select_pick(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle);
void undo_push_lattice(struct bContext *C, const char *name);
/* object_lattice.c */
void ED_setflagsLatt(struct Object *obedit, int flag);
void ED_lattice_flags_set(struct Object *obedit, int flag);
/* object_modifier.c */
enum {

10
source/blender/editors/metaball/mball_edit.c
View File

@ -63,7 +63,7 @@
#include "mball_intern.h"
/* This function is used to free all MetaElems from MetaBall */
void free_editMball(Object *obedit)
void ED_mball_editmball_free(Object *obedit)
{
MetaBall *mb = (MetaBall *)obedit->data;
@ -73,7 +73,7 @@ void free_editMball(Object *obedit)
/* This function is called, when MetaBall Object is
* switched from object mode to edit mode */
void make_editMball(Object *obedit)
void ED_mball_editmball_make(Object *obedit)
{
MetaBall *mb = (MetaBall *)obedit->data;
MetaElem *ml; /*, *newml;*/
@ -91,12 +91,12 @@ void make_editMball(Object *obedit)
/* This function is called, when MetaBall Object switched from
* edit mode to object mode. List of MetaElements is copied
* from object->data->edit_elems to object->data->elems. */
void load_editMball(Object *UNUSED(obedit))
void ED_mball_editmball_load(Object *UNUSED(obedit))
{
}
/* Add metaelem primitive to metaball object (which is in edit mode) */
MetaElem *add_metaball_primitive(bContext *UNUSED(C), Object *obedit, float mat[4][4], float dia, int type)
MetaElem *ED_mball_add_primitive(bContext *UNUSED(C), Object *obedit, float mat[4][4], float dia, int type)
{
MetaBall *mball = (MetaBall *)obedit->data;
MetaElem *ml;
@ -579,7 +579,7 @@ void MBALL_OT_reveal_metaelems(wmOperatorType *ot)
/* Select MetaElement with mouse click (user can select radius circle or
* stiffness circle) */
bool mouse_mball(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
bool ED_mball_select_pick(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle)
{
static MetaElem *startelem = NULL;
Object *obedit = CTX_data_edit_object(C);

4
source/blender/editors/object/object_add.c
View File

@ -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) {

24
source/blender/editors/object/object_edit.c
View File

@ -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);
}

4
source/blender/editors/object/object_hook.c
View File

@ -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:
{

20
source/blender/editors/object/object_lattice.c
View File

@ -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;
}

27
source/blender/editors/space_view3d/view3d_select.c
View File

@ -601,7 +601,7 @@ static void do_lasso_select_lattice(ViewContext *vc, const int mcords[][2], shor
view3d_userdata_lassoselect_init(&data, vc, &rect, mcords, moves, select);
if (extend == false && select)
ED_setflagsLatt(vc->obedit, 0);
ED_lattice_flags_set(vc->obedit, 0);
ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
lattice_foreachScreenVert(vc, do_lasso_select_lattice__doSelect, &data, V3D_PROJ_TEST_CLIP_DEFAULT);
@ -1394,8 +1394,9 @@ static void deselect_all_tracks(MovieTracking *tracking)
}
/* mval is region coords */
static bool mouse_select(bContext *C, const int mval[2],
bool extend, bool deselect, bool toggle, bool obcenter, bool enumerate, bool object)
static bool ed_object_select_pick(
bContext *C, const int mval[2],
bool extend, bool deselect, bool toggle, bool obcenter, bool enumerate, bool object)
{
ViewContext vc;
ARegion *ar = CTX_wm_region(C);
@ -1795,7 +1796,7 @@ static int do_lattice_box_select(ViewContext *vc, rcti *rect, bool select, bool
view3d_userdata_boxselect_init(&data, vc, rect, select);
if (extend == false && select)
ED_setflagsLatt(vc->obedit, 0);
ED_lattice_flags_set(vc->obedit, 0);
ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
lattice_foreachScreenVert(vc, do_lattice_box_select__doSelect, &data, V3D_PROJ_TEST_CLIP_DEFAULT);
@ -2202,7 +2203,9 @@ void VIEW3D_OT_select_border(wmOperatorType *ot)
/* mouse selection in weight paint */
/* gets called via generic mouse select operator */
static bool mouse_weight_paint_vertex_select(bContext *C, const int mval[2], bool extend, bool deselect, bool toggle, Object *obact)
static bool ed_wpaint_vertex_select_pick(
bContext *C, const int mval[2],
bool extend, bool deselect, bool toggle, Object *obact)
{
View3D *v3d = CTX_wm_view3d(C);
const bool use_zbuf = (v3d->flag & V3D_ZBUF_SELECT) != 0;
@ -2283,15 +2286,15 @@ static int view3d_select_exec(bContext *C, wmOperator *op)
if (obedit->type == OB_MESH)
retval = EDBM_select_pick(C, location, extend, deselect, toggle);
else if (obedit->type == OB_ARMATURE)
retval = mouse_armature(C, location, extend, deselect, toggle);
retval = ED_armature_select_pick(C, location, extend, deselect, toggle);
else if (obedit->type == OB_LATTICE)
retval = mouse_lattice(C, location, extend, deselect, toggle);
retval = ED_lattice_select_pick(C, location, extend, deselect, toggle);
else if (ELEM(obedit->type, OB_CURVE, OB_SURF))
retval = mouse_nurb(C, location, extend, deselect, toggle);
retval = ED_curve_editnurb_select_pick(C, location, extend, deselect, toggle);
else if (obedit->type == OB_MBALL)
retval = mouse_mball(C, location, extend, deselect, toggle);
retval = ED_mball_select_pick(C, location, extend, deselect, toggle);
else if (obedit->type == OB_FONT)
retval = mouse_font(C, location, extend, deselect, toggle);
retval = ED_curve_editfont_select_pick(C, location, extend, deselect, toggle);
}
else if (obact && obact->mode & OB_MODE_PARTICLE_EDIT)
@ -2299,9 +2302,9 @@ static int view3d_select_exec(bContext *C, wmOperator *op)
else if (obact && BKE_paint_select_face_test(obact))
retval = paintface_mouse_select(C, obact, location, extend, deselect, toggle);
else if (BKE_paint_select_vert_test(obact))
retval = mouse_weight_paint_vertex_select(C, location, extend, deselect, toggle, obact);
retval = ed_wpaint_vertex_select_pick(C, location, extend, deselect, toggle, obact);
else
retval = mouse_select(C, location, extend, deselect, toggle, center, enumerate, object);
retval = ed_object_select_pick(C, location, extend, deselect, toggle, center, enumerate, object);
/* passthrough allows tweaks
* FINISHED to signal one operator worked

8
source/blender/makesrna/intern/rna_object.c
View File

@ -280,12 +280,12 @@ static void rna_Object_active_shape_update(Main *bmain, Scene *scene, PointerRNA
break;
case OB_CURVE:
case OB_SURF:
load_editNurb(ob);
make_editNurb(ob);
ED_curve_editnurb_load(ob);
ED_curve_editnurb_make(ob);
break;
case OB_LATTICE:
load_editLatt(ob);
make_editLatt(ob);
ED_lattice_editlatt_load(ob);
ED_lattice_editlatt_make(ob);
break;
}
}

8
source/blenderplayer/bad_level_call_stubs/stubs.c
View File

@ -516,11 +516,11 @@ bool snapObjectsRayEx(struct Scene *scene, struct Base *base_act, struct View3D
const float ray_start[3], const float ray_normal[3], float *r_ray_dist,
const float mval[2], float *r_dist_px, float r_loc[3], float r_no[3], SnapMode mode) RET_ZERO
void make_editLatt(struct Object *obedit) RET_NONE
void load_editLatt(struct Object *obedit) RET_NONE
void ED_lattice_editlatt_make(struct Object *obedit) RET_NONE
void ED_lattice_editlatt_load(struct Object *obedit) RET_NONE
void load_editNurb(struct Object *obedit) RET_NONE
void make_editNurb(struct Object *obedit) RET_NONE
void ED_curve_editnurb_load(struct Object *obedit) RET_NONE
void ED_curve_editnurb_make(struct Object *obedit) RET_NONE
void uiItemR(uiLayout *layout, struct PointerRNA *ptr, const char *propname, int flag, const char *name, int icon) RET_NONE