diff options
author | Campbell Barton <campbell@blender.org> | 2022-06-01 08:19:33 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-06-01 08:38:48 +0300 |
commit | 61a7e5be186c911e6a5cbf92f4ced2670deb3af9 (patch) | |
tree | a96a038f07e75d1c8ad072ddc00079ea51d7a610 /intern/cycles/scene | |
parent | 4cab98f8be2712664d6e0f76aa06bfbab9f37204 (diff) |
Cleanup: '*' prefix C-comment blocks
Diffstat (limited to 'intern/cycles/scene')
-rw-r--r-- | intern/cycles/scene/image_vdb.cpp | 6 | ||||
-rw-r--r-- | intern/cycles/scene/shader_graph.cpp | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/intern/cycles/scene/image_vdb.cpp b/intern/cycles/scene/image_vdb.cpp index d0b41a239df..2209be60a97 100644 --- a/intern/cycles/scene/image_vdb.cpp +++ b/intern/cycles/scene/image_vdb.cpp @@ -114,9 +114,11 @@ bool VDBImageLoader::load_metadata(const ImageDeviceFeatures &features, ImageMet # ifdef WITH_NANOVDB if (features.has_nanovdb) { /* NanoVDB expects no inactive leaf nodes. */ - /*openvdb::FloatGrid &pruned_grid = *openvdb::gridPtrCast<openvdb::FloatGrid>(grid); +# if 0 + openvdb::FloatGrid &pruned_grid = *openvdb::gridPtrCast<openvdb::FloatGrid>(grid); openvdb::tools::pruneInactive(pruned_grid.tree()); - nanogrid = nanovdb::openToNanoVDB(pruned_grid);*/ + nanogrid = nanovdb::openToNanoVDB(pruned_grid); +# endif ToNanoOp op; op.precision = precision; if (!openvdb::grid_type_operation(grid, op)) { diff --git a/intern/cycles/scene/shader_graph.cpp b/intern/cycles/scene/shader_graph.cpp index d44e12f5fab..f25d0b7c7b9 100644 --- a/intern/cycles/scene/shader_graph.cpp +++ b/intern/cycles/scene/shader_graph.cpp @@ -888,7 +888,7 @@ void ShaderGraph::default_inputs(bool do_osl) void ShaderGraph::refine_bump_nodes() { - /* we transverse the node graph looking for bump nodes, when we find them, + /* We transverse the node graph looking for bump nodes, when we find them, * like in bump_from_displacement(), we copy the sub-graph defined from "bump" * input to the inputs "center","dx" and "dy" What is in "bump" input is moved * to "center" input. */ @@ -898,18 +898,18 @@ void ShaderGraph::refine_bump_nodes() ShaderInput *bump_input = node->input("Height"); ShaderNodeSet nodes_bump; - /* make 2 extra copies of the subgraph defined in Bump input */ + /* Make 2 extra copies of the subgraph defined in Bump input. */ ShaderNodeMap nodes_dx; ShaderNodeMap nodes_dy; - /* find dependencies for the given input */ + /* Find dependencies for the given input. */ find_dependencies(nodes_bump, bump_input); copy_nodes(nodes_bump, nodes_dx); copy_nodes(nodes_bump, nodes_dy); - /* mark nodes to indicate they are use for bump computation, so - that any texture coordinates are shifted by dx/dy when sampling */ + /* Mark nodes to indicate they are use for bump computation, so + * that any texture coordinates are shifted by dx/dy when sampling. */ foreach (ShaderNode *node, nodes_bump) node->bump = SHADER_BUMP_CENTER; foreach (NodePair &pair, nodes_dx) @@ -924,7 +924,7 @@ void ShaderGraph::refine_bump_nodes() connect(out_dx, node->input("SampleX")); connect(out_dy, node->input("SampleY")); - /* add generated nodes */ + /* Add generated nodes. */ foreach (NodePair &pair, nodes_dx) add(pair.second); foreach (NodePair &pair, nodes_dy) |