diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-07-03 18:01:57 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-07-03 18:01:57 +0400 |
| commit | 901f24716b70e961a28fabc5820ced0983b025e0 (patch) | |
| tree | df89551a3b687860c9242dc811f5e2af53c17e9c /source/blender/blenkernel | |
| parent | fdc59b8a40014c28e033f39cbf144565568d7058 (diff) | |
Dynamic Paint:
* Some ui and rna tweaking.
* Effects ui panel is no longer visible for non-paint surfaces.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_dynamicpaint.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/dynamicpaint.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_dynamicpaint.h b/source/blender/blenkernel/BKE_dynamicpaint.h index f9b16336de8..5c041cb4a5b 100644 --- a/source/blender/blenkernel/BKE_dynamicpaint.h +++ b/source/blender/blenkernel/BKE_dynamicpaint.h @@ -69,7 +69,7 @@ void dynamicPaint_Modifier_copy(struct DynamicPaintModifierData *pmd, struct Dyn void dynamicPaint_cacheUpdateFrames(struct DynamicPaintSurface *surface); void dynamicPaint_clearSurface(DynamicPaintSurface *surface); int dynamicPaint_resetSurface(struct DynamicPaintSurface *surface); -int dynamicPaint_surfaceHasPreview(DynamicPaintSurface *surface); +int dynamicPaint_surfaceHasColorPreview(DynamicPaintSurface *surface); void dynamicPaintSurface_updateType(struct DynamicPaintSurface *surface); void dynamicPaintSurface_setUniqueName(DynamicPaintSurface *surface, char *basename); diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index f0785d1f0fe..e36167fb23f 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -90,7 +90,6 @@ struct Object; struct Scene; struct DerivedMesh; -//struct DynamicPaintModifierData; /* * Init predefined antialias jitter data @@ -217,10 +216,11 @@ static int dynamicPaint_surfaceNumOfPoints(DynamicPaintSurface *surface) } /* checks whether surface's format/type has realtime preview */ -int dynamicPaint_surfaceHasPreview(DynamicPaintSurface *surface) { +int dynamicPaint_surfaceHasColorPreview(DynamicPaintSurface *surface) { if (surface->format == MOD_DPAINT_SURFACE_F_IMAGESEQ) return 0; else if (surface->format == MOD_DPAINT_SURFACE_F_VERTEX) { - if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE) return 0; + if (surface->type == MOD_DPAINT_SURFACE_T_DISPLACE || + surface->type == MOD_DPAINT_SURFACE_T_WAVE) return 0; else return 1; } else return 1; @@ -247,7 +247,7 @@ static void dynamicPaint_resetPreview(DynamicPaintCanvasSettings *canvas) int done=0; for(; surface; surface=surface->next) { - if (!done && dynamicPaint_surfaceHasPreview(surface)) { + if (!done && dynamicPaint_surfaceHasColorPreview(surface)) { surface->flags |= MOD_DPAINT_PREVIEW; done=1; } @@ -295,7 +295,7 @@ void dynamicPaintSurface_updateType(struct DynamicPaintSurface *surface) { } /* update preview */ - if (dynamicPaint_surfaceHasPreview(surface)) + if (dynamicPaint_surfaceHasColorPreview(surface)) dynamicPaint_setPreview(surface); else dynamicPaint_resetPreview(surface->canvas); |