diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-06-16 14:41:00 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-06-16 14:41:00 +0400 |
| commit | 3de22dec26606c2c526f7193db038fa5125f9b03 (patch) | |
| tree | dd308dd2061a50b0f1bc2e63b6c05716f9bcab73 /source/blender/editors/space_time/space_time.c | |
| parent | 3b41ab432badf2d4598b798e0d0c6c9ece51172b (diff) | |
Dynamic Paint:
Committed changes from previous weeks, biggest changes are:
* Canvas can now have multiple "surfaces" that each can have specific format, type and settings.
* Renewed UI to support this new system.
* Aside from old "image sequence" output format, Dynamic Paint can now work on vertex level as well. Currently vertex paint and displace are supported.
* Integrated vertex level painting with Point Cache.
* Added viewport preview for Point Cache surfaces.
Due to massive amount of changes, old Dynamic Paint saves are no longer supported. Also some features are temporarily missing or may not work properly.
Diffstat (limited to 'source/blender/editors/space_time/space_time.c')
| -rw-r--r-- | source/blender/editors/space_time/space_time.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index e55fbe11e52..9c01780d65b 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -123,12 +123,14 @@ static void time_draw_cache(SpaceTime *stime, Object *ob) case PTCACHE_TYPE_SMOKE_HIGHRES: if (!(stime->cache_display & TIME_CACHE_SMOKE)) continue; break; + case PTCACHE_TYPE_DYNAMICPAINT: + if (!(stime->cache_display & TIME_CACHE_DYNAMICPAINT)) continue; + break; } if(pid->cache->cached_frames == NULL) continue; - /* make sure we have stc with correct array length */ if(stc == NULL || MEM_allocN_len(stc->array) != len*2*sizeof(float)) { if(stc) { @@ -185,6 +187,10 @@ static void time_draw_cache(SpaceTime *stime, Object *ob) col[0] = 0.2; col[1] = 0.2; col[2] = 0.2; col[3] = 0.1; break; + case PTCACHE_TYPE_DYNAMICPAINT: + col[0] = 1.0; col[1] = 0.1; col[2] = 0.75; + col[3] = 0.1; + break; } glColor4fv(col); @@ -631,7 +637,7 @@ static void time_init(wmWindowManager *UNUSED(wm), ScrArea *sa) /* enable all cache display */ stime->cache_display |= TIME_CACHE_DISPLAY; stime->cache_display |= (TIME_CACHE_SOFTBODY|TIME_CACHE_PARTICLES); - stime->cache_display |= (TIME_CACHE_CLOTH|TIME_CACHE_SMOKE); + stime->cache_display |= (TIME_CACHE_CLOTH|TIME_CACHE_SMOKE|TIME_CACHE_DYNAMICPAINT); } static SpaceLink *time_duplicate(SpaceLink *sl) |