[Bf-blender-cvs] [69a9dff01e0] cycles_procedural_api: fix for changes in master
Kévin Dietrich
noreply at git.blender.org
Tue Sep 22 14:14:45 CEST 2020
Commit: 69a9dff01e079cbce93822b5a1e5cf171eb61754
Author: Kévin Dietrich
Date: Mon Sep 21 11:48:01 2020 +0200
Branches: cycles_procedural_api
https://developer.blender.org/rB69a9dff01e079cbce93822b5a1e5cf171eb61754
fix for changes in master
===================================================================
M intern/cycles/blender/blender_curves.cpp
===================================================================
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp
index d5e120b8acf..1b7e88840d1 100644
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@ -742,7 +742,7 @@ static void export_hair_curves_motion(Hair *hair, BL::Hair b_hair, int motion_st
}
/* Export motion keys. */
- const int num_keys = hair->curve_keys.size();
+ const int num_keys = hair->get_curve_keys().size();
float4 *mP = attr_mP->data_float4() + motion_step * num_keys;
bool have_motion = false;
int num_motion_keys = 0;
@@ -769,8 +769,8 @@ static void export_hair_curves_motion(Hair *hair, BL::Hair b_hair, int motion_st
if (!have_motion) {
/* TODO: use epsilon for comparison? Was needed for particles due to
* transform, but ideally should not happen anymore. */
- float4 curve_key = float3_to_float4(hair->curve_keys[i]);
- curve_key.w = hair->curve_radius[i];
+ float4 curve_key = float3_to_float4(hair->get_curve_keys()[i]);
+ curve_key.w = hair->get_curve_radius()[i];
have_motion = !(mP[i] == curve_key);
}
}
More information about the Bf-blender-cvs
mailing list