From 24be998b986cb3bdc86527bfcbd792a5c4e7155e Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 29 Sep 2019 21:04:05 +0200 Subject: Fix T70345: wrong transforms of objects after recent NVIDIA workaround This reverts commit 44d042094e21b519b38a3d78761b64bb5ceeb350 and adds a simpler workaround for just the node links display issue. There are other issues though so this is not a full workaround. --- source/blender/editors/space_node/drawnode.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_node/drawnode.c') diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 93121a6bef9..4f4ea182da9 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -47,6 +47,7 @@ #include "GPU_batch.h" #include "GPU_batch_presets.h" +#include "GPU_extensions.h" #include "GPU_immediate.h" #include "GPU_matrix.h" #include "GPU_state.h" @@ -3889,7 +3890,9 @@ static void nodelink_batch_draw(SpaceNode *snode) void nodelink_batch_start(SpaceNode *UNUSED(snode)) { - g_batch_link.enabled = true; + /* TODO: partial workaround for NVIDIA driver bug on recent GTX/RTX cards, + * that breaks instancing when using indirect drawcal (see T70011). */ + g_batch_link.enabled = !GPU_type_matches(GPU_DEVICE_NVIDIA, GPU_OS_ANY, GPU_DRIVER_ANY); } void nodelink_batch_end(SpaceNode *snode) -- cgit v1.2.3