Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Goudey <h.goudey@me.com>2022-04-05 19:30:49 +0300
committerHans Goudey <h.goudey@me.com>2022-04-05 19:31:18 +0300
commitedcbf741df2f6d5567da123e1f4763cc82921ec8 (patch)
tree468815b4486f634f6bb3988c5a149f114fa77281 /intern/cycles/blender/object.cpp
parente51368728815e3700414a77bf91668425a9965ec (diff)
Refactor: Evaluate surface objects as mesh components
This commit furthers some of the changes that were started in rBb9febb54a492 and subsequent commits by changing the way surface objects are presented to render engines and other users of evaluated objects in the same way. Instead of presenting evaluated surface objects as an `OB_SURF` object with an evaluated mesh, `OB_SURF` objects can now have an evaluated geometry set, which uses the same system as other object types to deal with multi-type evaluated data. This clarification makes it more obvious that lots of code that dealt with the `DispList` type isn't used. It wasn't before either, now it's just *by design*. Over 1100 lines can be removed. The legacy curve draw cache code is much simpler now too. The idea behind the further removal of `DispList` is that it's better to focus optimization efforts on a single mesh data structure. One expected functional change is that the evaluated mesh from surface objects can now be used in geometry nodes with the object info node. Cycles and the OBJ IO tests had to be tweaked to avoid using evaluated surface objects instead of the newly exposed mesh objects. Differential Revision: https://developer.blender.org/D14550
Diffstat (limited to 'intern/cycles/blender/object.cpp')
-rw-r--r--intern/cycles/blender/object.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/intern/cycles/blender/object.cpp b/intern/cycles/blender/object.cpp
index d8f236e0641..f77cbdf847d 100644
--- a/intern/cycles/blender/object.cpp
+++ b/intern/cycles/blender/object.cpp
@@ -66,9 +66,8 @@ bool BlenderSync::object_is_geometry(BObjectInfo &b_ob_info)
}
/* Other object types that are not meshes but evaluate to meshes are presented to render engines
- * as separate instance objects. Metaballs and surface objects have not been affected by that
- * change yet. */
- if (type == BL::Object::type_SURFACE || type == BL::Object::type_META) {
+ * as separate instance objects. Metaballs have not been affected by that change yet. */
+ if (type == BL::Object::type_META) {
return true;
}