[Bf-blender-cvs] [96054b2] openvdb: Modification to the node's UI:

[Kévin Dietrich]

Commit: 96054b23ec4f79a7800f6fc3e059421cb4a21417
Author: Kévin Dietrich
Date:   Sun May 17 23:50:57 2015 +0200
Branches: openvdb
https://developer.blender.org/rB96054b23ec4f79a7800f6fc3e059421cb4a21417

Modification to the node's UI:

- avoid drawing properties' names
- give it a default size
- warn about OpenVDB not being available on the GPU

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

M       source/blender/editors/space_node/drawnode.c
M       source/blender/nodes/shader/nodes/node_shader_openvdb.c

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

diff --git a/source/blender/editors/space_node/drawnode.c 
b/source/blender/editors/space_node/drawnode.c
index c9d1b8e..b2939ea 100644
--- a/source/blender/editors/space_node/drawnode.c
+++ b/source/blender/editors/space_node/drawnode.c
@@ -963,8 +963,15 @@ static void node_shader_buts_uvmap(uiLayout *layout, 
bContext *C, PointerRNA *pt
 
 static void node_shader_buts_openvdb(uiLayout *layout, bContext *C, PointerRNA 
*ptr)
 {
-       uiItemR(layout, ptr, "filename", 0, NULL, 0);
-       uiItemR(layout, ptr, "sampling", 0, NULL, 0);
+       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)
+                       uiItemL(layout, IFACE_("OpenVDB is not supported on 
GPU"), ICON_NONE);
+       }
+
+       uiItemR(layout, ptr, "filename", 0, "", 0);
+       uiItemR(layout, ptr, "sampling", 0, "", 0);
 
        UNUSED_VARS(C);
 }
diff --git a/source/blender/nodes/shader/nodes/node_shader_openvdb.c 
b/source/blender/nodes/shader/nodes/node_shader_openvdb.c
index d7e6278..b24258a 100644
--- a/source/blender/nodes/shader/nodes/node_shader_openvdb.c
+++ b/source/blender/nodes/shader/nodes/node_shader_openvdb.c
@@ -58,6 +58,7 @@ void register_node_type_sh_openvdb(void)
 
        sh_node_type_base(&ntype, SH_NODE_OPENVDB, "OpenVDB Volume", 
NODE_CLASS_INPUT, 0);
        node_type_compatibility(&ntype, NODE_NEW_SHADING);
+       node_type_size_preset(&ntype, NODE_SIZE_MIDDLE);
        node_type_init(&ntype, node_shader_init_openvdb);
        node_type_storage(&ntype, "NodeShaderOpenVDB", 
node_free_standard_storage, node_copy_standard_storage);

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