diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-01-04 20:27:14 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-01-04 20:27:14 +0300 |
| commit | 7bd56f207d3008bbbdbd30fff0cdea7e030a17a4 (patch) | |
| tree | 48786cebc6f19d9d82388d2e5645230b3568df0f /source/blender/blenkernel/intern/scene.c | |
| parent | ac6019e07955de4b861c314648fff28de4fe5b7a (diff) | |
| parent | 329879239e6fa358e22bf92180e3d5ff9cee9ba1 (diff) | |
Merge remote-tracking branch 'origin/blender2.8' into render-layers
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 896d692cdde..8054050f59b 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -370,6 +370,7 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) BKE_paint_copy(&ts->imapaint.paint, &ts->imapaint.paint); ts->imapaint.paintcursor = NULL; id_us_plus((ID *)ts->imapaint.stencil); + ts->particle.paintcursor = NULL; /* duplicate Grease Pencil Drawing Brushes */ BLI_listbase_clear(&ts->gp_brushes); for (bGPDbrush *brush = sce->toolsettings->gp_brushes.first; brush; brush = brush->next) { @@ -560,6 +561,8 @@ void BKE_scene_free(Scene *sce) void BKE_scene_init(Scene *sce) { + ParticleEditSettings *pset; + int a; const char *colorspace_name; SceneRenderView *srv; CurveMapping *mblur_shutter_curve; @@ -735,6 +738,23 @@ void BKE_scene_init(Scene *sce) sce->unit.scale_length = 1.0f; + pset = &sce->toolsettings->particle; + pset->flag = PE_KEEP_LENGTHS | PE_LOCK_FIRST | PE_DEFLECT_EMITTER | PE_AUTO_VELOCITY; + pset->emitterdist = 0.25f; + pset->totrekey = 5; + pset->totaddkey = 5; + pset->brushtype = PE_BRUSH_NONE; + pset->draw_step = 2; + pset->fade_frames = 2; + pset->selectmode = SCE_SELECT_PATH; + for (a = 0; a < PE_TOT_BRUSH; a++) { + pset->brush[a].strength = 0.5f; + pset->brush[a].size = 50; + pset->brush[a].step = 10; + pset->brush[a].count = 10; + } + pset->brush[PE_BRUSH_CUT].strength = 1.0f; + sce->r.ffcodecdata.audio_mixrate = 48000; sce->r.ffcodecdata.audio_volume = 1.0f; sce->r.ffcodecdata.audio_bitrate = 192; |