diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-08-27 03:49:31 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-27 03:52:24 +0400 |
commit | e71f2fc3baff2743217d9e2331ed55e2f165cf5a (patch) | |
tree | 0b7e88a55ce287077dbdb3b70e6cfab659c12ee6 /source/blender/editors/space_node | |
parent | e827d904ae36a1b260ca2bfb04df23077edf66f4 (diff) |
Cleanup
Diffstat (limited to 'source/blender/editors/space_node')
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_node/node_draw.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 286585f5f1d..b760d9f5aa8 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -946,9 +946,13 @@ 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 && U.compute_device_type != 0 - && RNA_enum_get(&cscene, "feature_set") == 0)) + if (cscene.data && + ((U.compute_device_type != USER_COMPUTE_DEVICE_NONE) && + (RNA_enum_get(&cscene, "device") == 1) && + (RNA_enum_get(&cscene, "feature_set") == 0))) + { uiItemL(layout, IFACE_("Only enabled in experimental GPU kernel"), ICON_ERROR); + } } uiItemR(layout, ptr, "falloff", 0, "", ICON_NONE); diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c index a87d9854e6c..7b5ec38f4c6 100644 --- a/source/blender/editors/space_node/node_draw.c +++ b/source/blender/editors/space_node/node_draw.c @@ -138,7 +138,7 @@ void ED_node_tag_update_id(ID *id) DAG_id_tag_update(id, 0); WM_main_add_notifier(NC_TEXTURE | ND_NODES, id); } - else if(id == &ntree->id) { + else if (id == &ntree->id) { /* node groups */ DAG_id_tag_update(id, 0); } |