diff options
| author | Dalai Felinto <dalai@blender.org> | 2020-08-18 15:55:44 +0300 |
|---|---|---|
| committer | Dalai Felinto <dalai@blender.org> | 2020-08-18 15:55:44 +0300 |
| commit | 8ab0d0e3990881bf66e9cdd2f62cd2a464015496 (patch) | |
| tree | 11dd79c2b6b648eddbb9c4fffe5d66152db52134 /intern/cycles | |
| parent | c526a34fc2fe0d51a81837bd49dbc0b78c8b5224 (diff) | |
| parent | 83e3d25bcae37df0139bb93b85d7ae5bf3da553b (diff) | |
Merge remote-tracking branch 'origin/blender-v2.90-release'
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_curves.cpp | 10 |
2 files changed, 14 insertions, 0 deletions
diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index 2316800e21e..e0fa45dffbc 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -109,6 +109,10 @@ if(WITH_OPENIMAGEDENOISE) ) endif() +if(WITH_EXPERIMENTAL_FEATURES) + add_definitions(-DWITH_HAIR_NODES) +endif() + blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}") # avoid link failure with clang 3.4 debug diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 82c99631a89..6288c370567 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -628,6 +628,7 @@ void BlenderSync::sync_particle_hair( } } +#ifdef WITH_HAIR_NODES static float4 hair_point_as_float4(BL::HairPoint b_point) { float4 mP = float3_to_float4(get_float3(b_point.co())); @@ -806,6 +807,15 @@ void BlenderSync::sync_hair(Hair *hair, BL::Object &b_ob, bool motion, int motio export_hair_curves(scene, hair, b_hair); } } +#else +void BlenderSync::sync_hair(Hair *hair, BL::Object &b_ob, bool motion, int motion_step) +{ + (void)hair; + (void)b_ob; + (void)motion; + (void)motion_step; +} +#endif void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph, BL::Object b_ob, |