[Bf-blender-cvs] [21e71674430] temp-cycles-draw-manager: Fix edit mesh not updating in cycles
Dalai Felinto
noreply at git.blender.org
Tue May 2 14:33:59 CEST 2017
Commit: 21e7167443034caa99b7ebecd50b8ef329156ff2
Author: Dalai Felinto
Date: Tue May 2 14:33:46 2017 +0200
Branches: temp-cycles-draw-manager
https://developer.blender.org/rB21e7167443034caa99b7ebecd50b8ef329156ff2
Fix edit mesh not updating in cycles
===================================================================
M source/blender/blenkernel/intern/scene.c
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index bf5eaab6e3b..b963dbf89fa 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1418,13 +1418,19 @@ static bool check_rendered_viewport_visible(Main *bmain)
wmWindow *window;
for (window = wm->windows.first; window != NULL; window = window->next) {
bScreen *screen = window->screen;
+ Scene *scene = screen->scene;
ScrArea *area;
+ RenderEngineType *type = RE_engines_find(scene->r.engine);
+ if ((type->draw_engine != NULL) || (type->render_to_view == NULL)) {
+ continue;
+ }
+ const bool use_legacy = (type->flag & RE_USE_LEGACY_PIPELINE) != 0;
for (area = screen->areabase.first; area != NULL; area = area->next) {
View3D *v3d = area->spacedata.first;
if (area->spacetype != SPACE_VIEW3D) {
continue;
}
- if (v3d->drawtype == OB_RENDER) {
+ if (v3d->drawtype == OB_RENDER || !use_legacy) {
return true;
}
}
More information about the Bf-blender-cvs
mailing list