[Bf-blender-cvs] [95ac6bc] master: Fix T39606, SSS and Volume nodes were showing warning, even if CPU was used.

[Thomas Dinges]

Commit: 95ac6bc9e5a909fba2a248fcd619cf3ac9bdb7a4
Author: Thomas Dinges
Date:   Sat Apr 5 12:49:04 2014 +0200
https://developer.blender.org/rB95ac6bc9e5a909fba2a248fcd619cf3ac9bdb7a4

Fix T39606, SSS and Volume nodes were showing warning, even if CPU was used.

===================================================================

M       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 78dae08..eb5c23a 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);
        }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs