diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-01 00:42:25 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-02-01 00:42:25 +0400 |
| commit | ad96f8e8b8149606128e63a2941068e72dd336c9 (patch) | |
| tree | 0a16e2fe00cfaa2d42c0931914a8ec26abc9d533 /source/blender/blenkernel/intern/scene.c | |
| parent | df556a4eb6ddcfaa9ed50d5e91749c638f80cfab (diff) | |
Fix for a bug that Freestyle settings of a scene are reset when copying the scene.
Problem report by IRIE Shinsuke, many thanks!
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index ba43f238e76..f5d529f0f07 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -217,11 +217,7 @@ Scene *BKE_scene_copy(Scene *sce, int type) new_srl = scen->r.layers.first; for (srl = sce->r.layers.first; srl; srl = srl->next) { - if (type == SCE_COPY_FULL) { - FRS_copy_freestyle_config(&new_srl->freestyleConfig, &srl->freestyleConfig); - } else { - FRS_init_freestyle_config(&srl->freestyleConfig); - } + FRS_copy_freestyle_config(&new_srl->freestyleConfig, &srl->freestyleConfig); new_srl = new_srl->next; } } |