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:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-04-28 20:49:00 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-04-28 20:49:00 +0400
commitf88cfd9168c2977fc4acc414d8709da6484e23e7 (patch)
tree7fcf7cf479f94a1fd2bcb69ae846cd2078658b98 /source/blender/editors/object/object_add.c
parente2c453b5f9d3a0a26333b6585f07ebf9e3a24819 (diff)
Code and style cleanup in own modules in BKE and also mball module
- Make sure functions are named in way BKE_<object>_<action> (same way as RNA callbacks) - Make functions which are used by mball.c only static and remove their prototypes from public header file. Further cleanup is coming.
Diffstat (limited to 'source/blender/editors/object/object_add.c')
-rw-r--r--source/blender/editors/object/object_add.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 21c9f776b94..fcce65c9326 100644
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -1391,7 +1391,7 @@ static int convert_exec(bContext *C, wmOperator *op)
((Curve *)newob->data)->id.us--;
/* make a new copy of the curve */
- newob->data = copy_curve(ob->data);
+ newob->data = BKE_curve_copy(ob->data);
}
else {
newob = ob;
@@ -1456,7 +1456,7 @@ static int convert_exec(bContext *C, wmOperator *op)
((Curve *)newob->data)->id.us--;
/* make a new copy of the curve */
- newob->data = copy_curve(ob->data);
+ newob->data = BKE_curve_copy(ob->data);
}
else {
newob = ob;
@@ -1474,7 +1474,7 @@ static int convert_exec(bContext *C, wmOperator *op)
base->flag &= ~SELECT;
ob->flag &= ~SELECT;
- baseob = find_basis_mball(scene, ob);
+ baseob = BKE_metaball_basis_find(scene, ob);
if (ob != baseob) {
/* if motherball is converting it would be marked as done later */
@@ -1701,7 +1701,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
if (dupflag & USER_DUP_CURVE) {
ID_NEW_US2(obn->data)
else {
- obn->data = copy_curve(obn->data);
+ obn->data = BKE_curve_copy(obn->data);
didit = 1;
}
id->us--;
@@ -1711,7 +1711,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
if (dupflag & USER_DUP_SURF) {
ID_NEW_US2(obn->data)
else {
- obn->data = copy_curve(obn->data);
+ obn->data = BKE_curve_copy(obn->data);
didit = 1;
}
id->us--;
@@ -1721,7 +1721,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
if (dupflag & USER_DUP_FONT) {
ID_NEW_US2(obn->data)
else {
- obn->data = copy_curve(obn->data);
+ obn->data = BKE_curve_copy(obn->data);
didit = 1;
}
id->us--;
@@ -1731,7 +1731,7 @@ static Base *object_add_duplicate_internal(Main *bmain, Scene *scene, Base *base
if (dupflag & USER_DUP_MBALL) {
ID_NEW_US2(obn->data)
else {
- obn->data = copy_mball(obn->data);
+ obn->data = BKE_metaball_copy(obn->data);
didit = 1;
}
id->us--;