diff options
Diffstat (limited to 'source/blender/depsgraph/intern/builder')
4 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 6c9d008c904..25f1af9c620 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -424,7 +424,7 @@ void DepsgraphNodeBuilder::build_id(ID *id) build_shapekeys((Key *)id); break; case ID_LA: - build_lamp((Light *)id); + build_light((Light *)id); break; case ID_LP: build_lightprobe((LightProbe *)id); @@ -692,7 +692,7 @@ void DepsgraphNodeBuilder::build_object_data( } break; case OB_LAMP: - build_object_data_lamp(object); + build_object_data_light(object); break; case OB_CAMERA: build_object_data_camera(object); @@ -720,10 +720,10 @@ void DepsgraphNodeBuilder::build_object_data_camera(Object *object) build_camera(camera); } -void DepsgraphNodeBuilder::build_object_data_lamp(Object *object) +void DepsgraphNodeBuilder::build_object_data_light(Object *object) { Light *lamp = (Light *)object->data; - build_lamp(lamp); + build_light(lamp); } void DepsgraphNodeBuilder::build_object_data_lightprobe(Object *object) @@ -1417,7 +1417,7 @@ void DepsgraphNodeBuilder::build_camera(Camera *camera) op_node->set_as_exit(); } -void DepsgraphNodeBuilder::build_lamp(Light *lamp) +void DepsgraphNodeBuilder::build_light(Light *lamp) { if (built_map_.checkIsBuiltAndTag(lamp)) { return; @@ -1428,11 +1428,11 @@ void DepsgraphNodeBuilder::build_lamp(Light *lamp) &lamp->id, NodeType::PARAMETERS, OperationCode::PARAMETERS_EVAL); /* NOTE: We mark this node as both entry and exit. This way we have a * node to link all dependencies for shading (which includes relation to the - * lamp object, and incldues relation from node tree) without adding a + * light object, and incldues relation from node tree) without adding a * dedicated component type. */ op_node->set_as_entry(); op_node->set_as_exit(); - /* lamp's nodetree */ + /* light's nodetree */ build_nodetree(lamp->nodetree); } diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h index b80b54432d4..88d5dee535a 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.h @@ -172,7 +172,7 @@ struct DepsgraphNodeBuilder { void build_object_data_geometry(Object *object, bool is_object_visible); void build_object_data_geometry_datablock(ID *obdata, bool is_object_visible); - void build_object_data_lamp(Object *object); + void build_object_data_light(Object *object); void build_object_data_lightprobe(Object *object); void build_object_data_speaker(Object *object); void build_object_transform(Object *object); @@ -204,7 +204,7 @@ struct DepsgraphNodeBuilder { void build_armature(bArmature *armature); void build_shapekeys(Key *key); void build_camera(Camera *camera); - void build_lamp(Light *lamp); + void build_light(Light *lamp); void build_nodetree(bNodeTree *ntree); void build_material(Material *ma); void build_texture(Tex *tex); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 6a611e95e8a..2a9f81b8495 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -495,7 +495,7 @@ void DepsgraphRelationBuilder::build_id(ID *id) build_shapekeys((Key *)id); break; case ID_LA: - build_lamp((Light *)id); + build_light((Light *)id); break; case ID_LP: build_lightprobe((LightProbe *)id); @@ -774,7 +774,7 @@ void DepsgraphRelationBuilder::build_object_data(Object *object) } break; case OB_LAMP: - build_object_data_lamp(object); + build_object_data_light(object); break; case OB_CAMERA: build_object_data_camera(object); @@ -804,10 +804,10 @@ void DepsgraphRelationBuilder::build_object_data_camera(Object *object) add_relation(camera_parameters_key, object_parameters_key, "Camera -> Object"); } -void DepsgraphRelationBuilder::build_object_data_lamp(Object *object) +void DepsgraphRelationBuilder::build_object_data_light(Object *object) { Light *lamp = (Light *)object->data; - build_lamp(lamp); + build_light(lamp); ComponentKey lamp_parameters_key(&lamp->id, NodeType::PARAMETERS); ComponentKey object_parameters_key(&object->id, NodeType::PARAMETERS); add_relation(lamp_parameters_key, object_parameters_key, "Light -> Object"); @@ -2348,13 +2348,13 @@ void DepsgraphRelationBuilder::build_camera(Camera *camera) } } -/* Lamps */ -void DepsgraphRelationBuilder::build_lamp(Light *lamp) +/* Lights */ +void DepsgraphRelationBuilder::build_light(Light *lamp) { if (built_map_.checkIsBuiltAndTag(lamp)) { return; } - /* lamp's nodetree */ + /* light's nodetree */ if (lamp->nodetree != NULL) { build_nodetree(lamp->nodetree); ComponentKey lamp_parameters_key(&lamp->id, NodeType::PARAMETERS); diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.h b/source/blender/depsgraph/intern/builder/deg_builder_relations.h index 1b115034608..190fcb7aedf 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.h +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.h @@ -217,7 +217,7 @@ struct DepsgraphRelationBuilder void build_object_data_camera(Object *object); void build_object_data_geometry(Object *object); void build_object_data_geometry_datablock(ID *obdata); - void build_object_data_lamp(Object *object); + void build_object_data_light(Object *object); void build_object_data_lightprobe(Object *object); void build_object_data_speaker(Object *object); void build_object_parent(Object *object); @@ -265,7 +265,7 @@ struct DepsgraphRelationBuilder void build_shapekeys(Key *key); void build_armature(bArmature *armature); void build_camera(Camera *camera); - void build_lamp(Light *lamp); + void build_light(Light *lamp); void build_nodetree(bNodeTree *ntree); void build_material(Material *ma); void build_texture(Tex *tex); |