From 7636e9785dc11fc9f11f89ba055f414e6efe43fa Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 4 Feb 2019 15:34:31 +0100 Subject: Cleanup: BKE_library: remove 'test' param of id_copy. This was used in *one* place only... much better to have a dedicated helper for that kind of things. ;) --- source/blender/modifiers/intern/MOD_boolean.c | 3 +-- source/blender/modifiers/intern/MOD_cloth.c | 3 +-- source/blender/modifiers/intern/MOD_collision.c | 3 +-- source/blender/modifiers/intern/MOD_datatransfer.c | 3 +-- source/blender/modifiers/intern/MOD_meshsequencecache.c | 3 +-- source/blender/modifiers/intern/MOD_normal_edit.c | 3 +-- source/blender/modifiers/intern/MOD_ocean.c | 3 +-- source/blender/modifiers/intern/MOD_surface.c | 3 +-- source/blender/modifiers/intern/MOD_util.c | 3 +-- source/blender/modifiers/intern/MOD_weighted_normal.c | 3 +-- 10 files changed, 10 insertions(+), 20 deletions(-) (limited to 'source/blender/modifiers') diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index d5f123f2d6a..2aab1b7844d 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -115,8 +115,7 @@ static Mesh *get_quick_mesh( LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG | - LIB_ID_COPY_NO_PREVIEW, - false); + LIB_ID_COPY_NO_PREVIEW); float imat[4][4]; float omat[4][4]; diff --git a/source/blender/modifiers/intern/MOD_cloth.c b/source/blender/modifiers/intern/MOD_cloth.c index c425abe142e..27ec0595b54 100644 --- a/source/blender/modifiers/intern/MOD_cloth.c +++ b/source/blender/modifiers/intern/MOD_cloth.c @@ -92,8 +92,7 @@ static void deformVerts( LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG | - LIB_ID_COPY_NO_PREVIEW, - false); + LIB_ID_COPY_NO_PREVIEW); } /* TODO(sergey): For now it actually duplicates logic from DerivedMesh.c diff --git a/source/blender/modifiers/intern/MOD_collision.c b/source/blender/modifiers/intern/MOD_collision.c index a2f70fe6913..541bbf32af8 100644 --- a/source/blender/modifiers/intern/MOD_collision.c +++ b/source/blender/modifiers/intern/MOD_collision.c @@ -112,8 +112,7 @@ static void deformVerts( LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG | - LIB_ID_COPY_NO_PREVIEW, - false); + LIB_ID_COPY_NO_PREVIEW); } if (!ob->pd) { diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c index 3841ca50bcb..1e90642cf62 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.c +++ b/source/blender/modifiers/intern/MOD_datatransfer.c @@ -182,8 +182,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG | - LIB_ID_COPY_NO_PREVIEW, - false); + LIB_ID_COPY_NO_PREVIEW); } BKE_reports_init(&reports, RPT_STORE); diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c index 16fcbadb0f3..1c547f23978 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.c +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c @@ -122,8 +122,7 @@ static Mesh *applyModifier( LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG | - LIB_ID_COPY_NO_PREVIEW, - false); + LIB_ID_COPY_NO_PREVIEW); } } diff --git a/source/blender/modifiers/intern/MOD_normal_edit.c b/source/blender/modifiers/intern/MOD_normal_edit.c index a92e86ec9f0..37e3acdee1f 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.c +++ b/source/blender/modifiers/intern/MOD_normal_edit.c @@ -416,8 +416,7 @@ static Mesh *normalEditModifier_do( LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG | - LIB_ID_COPY_NO_PREVIEW, - false); + LIB_ID_COPY_NO_PREVIEW); } else { result = mesh; diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 6570f222877..e0f6eff56d4 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -388,8 +388,7 @@ static Mesh *doOcean(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mes LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG | - LIB_ID_COPY_NO_PREVIEW, - false); + LIB_ID_COPY_NO_PREVIEW); } cfra_for_cache = cfra_scene; diff --git a/source/blender/modifiers/intern/MOD_surface.c b/source/blender/modifiers/intern/MOD_surface.c index e467c6fcd17..beaf471778b 100644 --- a/source/blender/modifiers/intern/MOD_surface.c +++ b/source/blender/modifiers/intern/MOD_surface.c @@ -119,8 +119,7 @@ static void deformVerts( LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG | - LIB_ID_COPY_NO_PREVIEW, - false); + LIB_ID_COPY_NO_PREVIEW); } else { surmd->mesh = MOD_deform_mesh_eval_get(ctx->object, NULL, NULL, NULL, numVerts, false, false); diff --git a/source/blender/modifiers/intern/MOD_util.c b/source/blender/modifiers/intern/MOD_util.c index 52b5fbf53b8..d40dd6545b7 100644 --- a/source/blender/modifiers/intern/MOD_util.c +++ b/source/blender/modifiers/intern/MOD_util.c @@ -190,8 +190,7 @@ Mesh *MOD_deform_mesh_eval_get( LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG | LIB_ID_COPY_NO_PREVIEW | - LIB_ID_COPY_CD_REFERENCE), - false); + LIB_ID_COPY_CD_REFERENCE)); mesh->runtime.deformed_only = 1; } diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.c b/source/blender/modifiers/intern/MOD_weighted_normal.c index e3c09fa944b..d61fcb01d5e 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.c +++ b/source/blender/modifiers/intern/MOD_weighted_normal.c @@ -495,8 +495,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes LIB_ID_CREATE_NO_MAIN | LIB_ID_CREATE_NO_USER_REFCOUNT | LIB_ID_CREATE_NO_DEG_TAG | - LIB_ID_COPY_NO_PREVIEW, - false); + LIB_ID_COPY_NO_PREVIEW); const int numVerts = result->totvert; const int numEdges = result->totedge; -- cgit v1.2.3