Commit: 904cab0418c423bd19d9cf74526dad6f57a5aac7
Author: Brecht Van Lommel
Date: Tue Oct 18 14:13:05 2022 +0200
Branches: master
https://developer.blender.org/rB904cab0418c423bd19d9cf74526dad6f57a5aac7
Fix Cycles Hydra build errors
Still initializing GLEW after libepoxy switch, and ellipse area light.
===================================================================
M intern/cycles/hydra/display_driver.cpp
M intern/cycles/hydra/light.cpp
===================================================================
diff --git a/intern/cycles/hydra/display_driver.cpp
b/intern/cycles/hydra/display_driver.cpp
index 1a989605335..711542e0a3f 100644
--- a/intern/cycles/hydra/display_driver.cpp
+++ b/intern/cycles/hydra/display_driver.cpp
@@ -64,10 +64,6 @@ void HdCyclesDisplayDriver::gl_context_create()
#endif
if (!gl_pbo_id_) {
- if (glewInit() != GLEW_OK) {
- return;
- }
-
glGenBuffers(1, &gl_pbo_id_);
}
}
diff --git a/intern/cycles/hydra/light.cpp b/intern/cycles/hydra/light.cpp
index 195b0794a75..36ef6cdc390 100644
--- a/intern/cycles/hydra/light.cpp
+++ b/intern/cycles/hydra/light.cpp
@@ -382,12 +382,12 @@ void HdCyclesLight::Initialize(HdRenderParam *renderParam)
}
else if (_lightType == HdPrimTypeTokens->diskLight) {
_light->set_light_type(LIGHT_AREA);
- _light->set_round(true);
+ _light->set_ellipse(true);
_light->set_size(1.0f);
}
else if (_lightType == HdPrimTypeTokens->rectLight) {
_light->set_light_type(LIGHT_AREA);
- _light->set_round(false);
+ _light->set_ellipse(false);
_light->set_size(1.0f);
}
else if (_lightType == HdPrimTypeTokens->sphereLight) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
