diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2020-10-27 13:40:42 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2020-10-27 13:40:42 +0300 |
| commit | 30f626fe4cd62f406468ef0ff2169694424b1a29 (patch) | |
| tree | d428586cd3a6e689ab1e2f5a4222d1e0eb77ada7 /intern/cycles/render/geometry.h | |
| parent | 17381c7b90eb3acde53eca013ae5a5a55699f17d (diff) | |
Revert "Cycles API: encapsulate Node socket members"
This reverts commit 527f8b32b32187f754e5b176db6377736f9cb8ff. It is causing
motion blur test failures and crashes in some renders, reverting until this is
fixed.
Diffstat (limited to 'intern/cycles/render/geometry.h')
| -rw-r--r-- | intern/cycles/render/geometry.h | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/intern/cycles/render/geometry.h b/intern/cycles/render/geometry.h index 1a374c57463..bcadb3a8051 100644 --- a/intern/cycles/render/geometry.h +++ b/intern/cycles/render/geometry.h @@ -56,13 +56,13 @@ class Geometry : public Node { VOLUME, }; - Type geometry_type; + Type type; /* Attributes */ AttributeSet attributes; /* Shaders */ - NODE_SOCKET_API_ARRAY(array<Node *>, used_shaders) + vector<Shader *> used_shaders; /* Transform */ BoundBox bounds; @@ -71,8 +71,8 @@ class Geometry : public Node { Transform transform_normal; /* Motion Blur */ - NODE_SOCKET_API(uint, motion_steps) - NODE_SOCKET_API(bool, use_motion_blur) + uint motion_steps; + bool use_motion_blur; /* Maximum number of motion steps supported (due to Embree). */ static const uint MAX_MOTION_STEPS = 129; @@ -88,6 +88,7 @@ class Geometry : public Node { bool has_surface_bssrdf; /* Set in the device_update_flags(). */ /* Update Flags */ + bool need_update; bool need_update_rebuild; /* Constructor/Destructor */ @@ -137,16 +138,6 @@ class Geometry : public Node { bool has_motion_blur() const; bool has_voxel_attributes() const; - bool is_mesh() const - { - return geometry_type == MESH; - } - - bool is_hair() const - { - return geometry_type == HAIR; - } - /* Updates */ void tag_update(Scene *scene, bool rebuild); }; @@ -209,21 +200,6 @@ class GeometryManager { void device_update_displacement_images(Device *device, Scene *scene, Progress &progress); void device_update_volume_images(Device *device, Scene *scene, Progress &progress); - - private: - static void update_attribute_element_offset(Geometry *geom, - device_vector<float> &attr_float, - size_t &attr_float_offset, - device_vector<float2> &attr_float2, - size_t &attr_float2_offset, - device_vector<float4> &attr_float3, - size_t &attr_float3_offset, - device_vector<uchar4> &attr_uchar4, - size_t &attr_uchar4_offset, - Attribute *mattr, - AttributePrimitive prim, - TypeDesc &type, - AttributeDescriptor &desc); }; CCL_NAMESPACE_END |