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>2019-01-15 15:27:54 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-01-15 15:30:31 +0300
commit2d98dce7ee29b7e5d685ee5de9aa1e4eebe46a01 (patch)
treece9baf87f55adff9f85e96283b6aef2a0176220c /source/blender/blenkernel
parentb8e8c0e325d213f2dcf4adad5506989fa224716e (diff)
Cleanup: rename BASE_FROMDUPLI -> BASE_FROM_DUPLI
Matches `BASE_FROM_SET`.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/intern/mball.c2
-rw-r--r--source/blender/blenkernel/intern/object.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index cff425dbd1b..5ce080fd4c2 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -422,7 +422,7 @@ Object *BKE_mball_basis_find(Scene *scene, Object *basis)
for (ViewLayer *view_layer = scene->view_layers.first; view_layer; view_layer = view_layer->next) {
for (Base *base = view_layer->object_bases.first; base; base = base->next) {
Object *ob = base->object;
- if ((ob->type == OB_MBALL) && !(base->flag & BASE_FROMDUPLI)) {
+ if ((ob->type == OB_MBALL) && !(base->flag & BASE_FROM_DUPLI)) {
if (ob != bob) {
BLI_split_name_num(obname, &obnr, ob->id.name + 2, '.');
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 44d5b29d4aa..4e1ba003228 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -542,7 +542,7 @@ void BKE_object_free_caches(Object *object)
* object created by dependency graph, which shares pointers with original
* object. In this case we can not free anything.
*/
- if ((object->base_flag & BASE_FROMDUPLI) == 0) {
+ if ((object->base_flag & BASE_FROM_DUPLI) == 0) {
BKE_object_free_derived_caches(object);
update_flag |= ID_RECALC_GEOMETRY;
}