diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-03-30 18:01:23 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-03-30 18:01:23 +0300 |
commit | ce3c7e8ff515e5bfbf70d0f4f60557e26c9d98a1 (patch) | |
tree | 1062bd45d22a2a0aff4e4a227079154b78c42263 /source/blender/makesdna/DNA_material_types.h | |
parent | 98e69631b0cf31b5b73c1d9afb9bd9fc81fc42be (diff) |
Layers: use IDProperty and override collection properties system
First this replace a custom data struct with IDProperty, and use
IDProperty group merge and copying functions. Which means that a collection
property setting is only created if necessary.
This implements the "Layer Collection settings" override system, as
suggested in the "Override Manifesto" document.
The core is working, with Scene, LayerCollection and Object using a
single IDProperty to store all the render settings data. Next step is to
migrate this to depsgraph.
Note: Clay engine "ssao_samples" was hardcoded to 32 for now. It will come
back as part of "Workspace Settings" later.
Many thanks for Bastien Montagne for the help with the UI template
nightmare ;)
Differential Revision: https://developer.blender.org/D2563
Diffstat (limited to 'source/blender/makesdna/DNA_material_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_material_types.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h index bd8278f897a..67bc49032d5 100644 --- a/source/blender/makesdna/DNA_material_types.h +++ b/source/blender/makesdna/DNA_material_types.h @@ -90,38 +90,11 @@ typedef struct TexPaintSlot { int pad; } TexPaintSlot; -/* Material Engine Settings */ -typedef struct MaterialEngineSettings { - struct MaterialEngineSettings *next, *prev; - char name[32]; /* engine name - MAX_NAME */ - void *data; -} MaterialEngineSettings; - /* Clay engine */ /* MaterialRuntimeClay.flag */ #define CLAY_OUTDATED 1 -typedef struct MaterialEngineSettingsClay { - short type; - short matcap_icon; /* Icon ID */ - - float matcap_rot; - float matcap_hue; - float matcap_sat; - float matcap_val; - - float ssao_distance; - float ssao_attenuation; - float ssao_factor_cavity; - float ssao_factor_edge; - - /* Runtime */ - short flag; - short pad; - int ubo_index; -} MaterialEngineSettingsClay; - /* MaterialEngineSettingsClay.type */ #define CLAY_MATCAP_NONE 0 #define CLAY_MATCAP_SIMPLE 1 @@ -240,9 +213,6 @@ typedef struct Material { struct TexPaintSlot *texpaintslot; /* cached slot for painting. Make sure to recalculate before use * with refresh_texpaint_image_cache */ - /* Engine Settings */ - ListBase engines_settings; /* MaterialEngineSettings */ - ListBase gpumaterial; /* runtime */ } Material; |