[Bf-blender-cvs] [d94eaf784cd] cycles_procedural_api: small cleanup
Kévin Dietrich
noreply at git.blender.org
Mon Nov 16 13:10:19 CET 2020
Commit: d94eaf784cdbca756cd419b1197b9c6c3e3254f4
Author: Kévin Dietrich
Date: Mon Nov 9 12:38:08 2020 +0100
Branches: cycles_procedural_api
https://developer.blender.org/rBd94eaf784cdbca756cd419b1197b9c6c3e3254f4
small cleanup
===================================================================
M intern/cycles/render/geometry.cpp
===================================================================
diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp
index b4dd4e01f04..9f8f4157534 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -1133,22 +1133,8 @@ void GeometryManager::device_update_mesh(
if (curve_size != 0) {
progress.set_status("Updating Mesh", "Copying Strands to device");
- float4 *curve_keys;
- float4 *curves;
-
- if (device_update_flags & DEVICE_CURVE_KEYS_NEEDS_REALLOC) {
- curve_keys = dscene->curve_keys.alloc(curve_key_size);
- }
- else {
- curve_keys = dscene->curve_keys.data();
- }
-
- if (device_update_flags & DEVICE_CURVES_NEEDS_REALLOC) {
- curves = dscene->curves.alloc(curve_size);
- }
- else {
- curves = dscene->curves.data();
- }
+ float4 *curve_keys = dscene->curve_keys.alloc(curve_key_size);
+ float4 *curves = dscene->curves.alloc(curve_size);
foreach (Geometry *geom, scene->geometry) {
if (geom->is_hair()) {
More information about the Bf-blender-cvs
mailing list