diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-02-04 17:34:31 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-02-05 11:49:50 +0300 |
| commit | 7636e9785dc11fc9f11f89ba055f414e6efe43fa (patch) | |
| tree | 984db57bc800523950d7f01b945f8553d0c7232f /source/blender/editors | |
| parent | 999f3985c07704f0edbe4e505172859b2e676634 (diff) | |
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. ;)
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/physics/particle_object.c | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index ae522a335fe..662c1b7df50 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -733,8 +733,7 @@ static void template_ID( but->flag |= UI_BUT_UNDO; UI_but_funcN_set(but, template_id_cb, MEM_dupallocN(template_ui), POINTER_FROM_INT(UI_ID_ALONE)); - if (/* test only */ - (id_copy(CTX_data_main(C), id, NULL, true) == false) || + if ((!BKE_id_copy_is_allowed(id)) || (idfrom && idfrom->lib) || (!editable) || /* object in editmode - don't change data */ diff --git a/source/blender/editors/physics/particle_object.c b/source/blender/editors/physics/particle_object.c index 8d2ea9864ee..4894828f808 100644 --- a/source/blender/editors/physics/particle_object.c +++ b/source/blender/editors/physics/particle_object.c @@ -722,8 +722,7 @@ static bool remap_hair_emitter( 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); /* BMESH_ONLY, deform dm may not have tessface */ BKE_mesh_tessface_ensure(mesh); @@ -1104,8 +1103,7 @@ static bool copy_particle_systems_to_object(const bContext *C, 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_mesh_calc_normals(psmd->mesh_final); BKE_mesh_tessface_ensure(psmd->mesh_final); |