Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2019-04-24 16:43:58 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-04-25 09:02:18 +0300
commit6d09fa357731e3444a08aa7e705aab8fb4ed895d (patch)
tree37094424c2ad8e003558f113768dc827395e02bc /source/blender/makesdna/DNA_dynamicpaint_types.h
parent78f8679cfc6d6e8f19d84908ab4343ce6638faf3 (diff)
DynamicPaint: Remove Previews
Modifier previews should be implemented by a more generic system. The current system is already a hack and needed a lot of work to get it working again in 2.80 and even so that would be replaced by another system in the near future. For Vertex Colors we have a work around in place by using Workbench Vertex Colors. For Vertex Weights we loose the previewing. Not sure targetting weight is working (even for 279). Reviewed By: brecht Maniphest Tasks: T63857 Differential Revision: https://developer.blender.org/D4734
Diffstat (limited to 'source/blender/makesdna/DNA_dynamicpaint_types.h')
-rw-r--r--source/blender/makesdna/DNA_dynamicpaint_types.h17
1 files changed, 0 insertions, 17 deletions
diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h
index 5d482024d07..38b3a4d4c89 100644
--- a/source/blender/makesdna/DNA_dynamicpaint_types.h
+++ b/source/blender/makesdna/DNA_dynamicpaint_types.h
@@ -48,7 +48,6 @@ enum {
MOD_DPAINT_MULALPHA = 1 << 3, /* Multiply color by alpha when saving image */
MOD_DPAINT_DISSOLVE_LOG = 1 << 4, /* Use 1/x for surface dissolve */
MOD_DPAINT_DRY_LOG = 1 << 5, /* Use 1/x for drying paint */
- MOD_DPAINT_PREVIEW = 1 << 6, /* preview this surface on viewport*/
MOD_DPAINT_WAVE_OPEN_BORDERS = 1 << 7, /* passes waves through mesh edges */
MOD_DPAINT_DISP_INCREMENTAL = 1 << 8, /* builds displace on top of earlier values */
@@ -77,12 +76,6 @@ enum {
MOD_DPAINT_EFFECT_DO_SHRINK = 1 << 2, /* do shrink effect */
};
-/* preview_id */
-enum {
- MOD_DPAINT_SURFACE_PREV_PAINT = 0,
- MOD_DPAINT_SURFACE_PREV_WETMAP = 1,
-};
-
/* init_color_type */
enum {
MOD_DPAINT_INITIAL_NONE = 0,
@@ -120,15 +113,11 @@ typedef struct DynamicPaintSurface {
short disp_type, image_fileformat;
/** Ui selection box. */
short effect_ui;
- /** Surface output id to preview. */
- short preview_id;
short init_color_type;
- char _pad0[2];
int flags, effect;
int image_resolution, substeps;
int start_frame, end_frame;
- char _pad[4];
/* initial color */
float init_color[4];
@@ -163,12 +152,6 @@ typedef struct DynamicPaintSurface {
/* canvas flags */
enum {
-/* This should not be needed, having a valid WEIGHT_MCOL layer should be enough.
- * And if not, should be a general flag. But seems unnecessary for now... */
-#if 0
- /** if viewport preview is ready */
- MOD_DPAINT_PREVIEW_READY = 1 << 0,
-#endif
/** surface is already baking, so it wont get updated (loop) */
MOD_DPAINT_BAKING = 1 << 1,
};