diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2018-05-29 12:20:37 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2018-05-30 13:25:20 +0300 |
commit | e0e3038b1e7aec26da7161defa5a34b5d9373b5c (patch) | |
tree | 39fc5c0137fc7ee6bef28eb84ef0d85964ba99a2 /source/blender/makesdna | |
parent | ec6da3d72e61240bfec1c09f1ef75e41873bf6a0 (diff) |
Hair Particles: DNA: Add properties for new GPU hairs.
Hair Particles shape properties are ported from cycles. Thoses properties
have the same defaults and have a do_version of their own. Cycles will use
theses properties instead of its custom ones.
Some realtime engine specific settings are also added to scene->r because
it's much easier to control as global values.
Bumping Version number so cycles can do its own do_version on top of the
default settings.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 19 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 11 |
2 files changed, 25 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 583b8504524..8437c93a722 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -255,12 +255,18 @@ typedef struct ParticleSettings { /* modified dm support */ short use_modifier_stack; - short pad5; - int pad8; - float twist; - float pad6; + /* hair shape */ + short shape_flag; + short pad6; + + float twist, pad8; + + /* hair thickness shape */ + float shape; + float rad_root, rad_tip, rad_scale; + struct CurveMapping *twistcurve; void *pad7; } ParticleSettings; @@ -449,6 +455,11 @@ typedef enum eParticleChildFlag { PART_CHILD_USE_TWIST_CURVE = (1<<3), } eParticleChildFlag; +/* part->shape_flag */ +typedef enum eParticleShapeFlag { + PART_SHAPE_CLOSE_TIP = (1<<0), +} eParticleShapeFlag; + /* part->draw_col */ #define PART_DRAW_COL_NONE 0 #define PART_DRAW_COL_MAT 1 diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index cbd863f706f..d51c4912c5c 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -713,12 +713,21 @@ typedef struct RenderData { ListBase views; /* SceneRenderView */ short actview; short views_format; - short pad8[2]; + + /* Hair Display */ + short hair_type, hair_subdiv; /* Motion blur shutter */ struct CurveMapping mblur_shutter_curve; } RenderData; +/* RenderData.hair_type */ +typedef enum eHairType { + SCE_HAIR_SHAPE_STRAND = 0, + SCE_HAIR_SHAPE_STRIP = 1, +} eHairType; + + /* *************************************************************** */ /* Render Conversion/Simplfication Settings */ |