diff options
author | Thomas Dinges <blender@dingto.org> | 2014-04-05 14:49:04 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2014-04-05 14:49:30 +0400 |
commit | 95ac6bc9e5a909fba2a248fcd619cf3ac9bdb7a4 (patch) | |
tree | 10e10e6dd36c3df49df817e87945a5c191b191be /source/blender/editors/space_node/drawnode.c | |
parent | 53f6057aedfa94bbaa8e0e3773ea37726e1edf73 (diff) |
Fix T39606, SSS and Volume nodes were showing warning, even if CPU was used.
Diffstat (limited to 'source/blender/editors/space_node/drawnode.c')
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 78dae08bed0..eb5c23a60f7 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -37,6 +37,7 @@ #include "DNA_object_types.h" #include "DNA_space_types.h" #include "DNA_screen_types.h" +#include "DNA_userdef_types.h" #include "BKE_context.h" #include "BKE_curve.h" @@ -938,7 +939,7 @@ static void node_shader_buts_subsurface(uiLayout *layout, bContext *C, PointerRN PointerRNA scene = CTX_data_pointer_get(C, "scene"); if (scene.data) { PointerRNA cscene = RNA_pointer_get(&scene, "cycles"); - if (cscene.data && RNA_enum_get(&cscene, "device") == 1) + if (cscene.data && (RNA_enum_get(&cscene, "device") == 1 && U.compute_device_type != 0)) uiItemL(layout, IFACE_("SSS not supported on GPU"), ICON_ERROR); } @@ -948,12 +949,12 @@ static void node_shader_buts_subsurface(uiLayout *layout, bContext *C, PointerRN static void node_shader_buts_volume(uiLayout *layout, bContext *C, PointerRNA *UNUSED(ptr)) { - /* SSS does not work on GPU yet */ + /* Volume does not work on GPU yet */ PointerRNA scene = CTX_data_pointer_get(C, "scene"); if (scene.data) { PointerRNA cscene = RNA_pointer_get(&scene, "cycles"); - if (cscene.data && RNA_enum_get(&cscene, "device") == 1) + if (cscene.data && (RNA_enum_get(&cscene, "device") == 1 && U.compute_device_type != 0)) uiItemL(layout, IFACE_("Volumes not supported on GPU"), ICON_ERROR); } } |