Changeset View
Changeset View
Standalone View
Standalone View
source/blender/blenkernel/intern/object_dupli.cc
| Show First 20 Lines • Show All 781 Lines • ▼ Show 20 Lines | if (ctx->object->type != OB_MESH || geometry_set_is_instance) { | ||||
| } | } | ||||
| } | } | ||||
| if (ctx->object->type != OB_VOLUME || geometry_set_is_instance) { | if (ctx->object->type != OB_VOLUME || geometry_set_is_instance) { | ||||
| if (const Volume *volume = geometry_set.get_volume_for_read()) { | if (const Volume *volume = geometry_set.get_volume_for_read()) { | ||||
| DupliObject *dupli = make_dupli(ctx, ctx->object, parent_transform, component_index++); | DupliObject *dupli = make_dupli(ctx, ctx->object, parent_transform, component_index++); | ||||
| dupli->ob_data = (ID *)volume; | dupli->ob_data = (ID *)volume; | ||||
| } | } | ||||
| } | } | ||||
| if (!ELEM(ctx->object->type, OB_CURVES_LEGACY, OB_FONT) || geometry_set_is_instance) { | /* Always handle curve and text objects as geometry component instances, to simplify separating | ||||
| * the result of evalaution from the original object and displaying edit mode overlays. */ | |||||
| if (true) { | |||||
| if (const CurveComponent *component = geometry_set.get_component_for_read<CurveComponent>()) { | if (const CurveComponent *component = geometry_set.get_component_for_read<CurveComponent>()) { | ||||
| if (const Curve *curve = component->get_curve_for_render()) { | if (const Curve *curve = component->get_curve_for_render()) { | ||||
| DupliObject *dupli = make_dupli(ctx, ctx->object, parent_transform, component_index++); | DupliObject *dupli = make_dupli(ctx, ctx->object, parent_transform, component_index++); | ||||
| dupli->ob_data = (ID *)curve; | dupli->ob_data = (ID *)curve; | ||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| if (ctx->object->type != OB_POINTCLOUD || geometry_set_is_instance) { | if (ctx->object->type != OB_POINTCLOUD || geometry_set_is_instance) { | ||||
| ▲ Show 20 Lines • Show All 832 Lines • Show Last 20 Lines | |||||