[Bf-blender-cvs] [f3fa5c1258d] master: Depsgraph: Cleanup, always call full `object`
Sergey Sharybin
noreply at git.blender.org
Thu Nov 23 11:39:59 CET 2017
Commit: f3fa5c1258d2fb08b83e080b99172ccc0dc1d67a
Author: Sergey Sharybin
Date: Thu Nov 23 11:39:28 2017 +0100
Branches: master
https://developer.blender.org/rBf3fa5c1258d2fb08b83e080b99172ccc0dc1d67a
Depsgraph: Cleanup, always call full `object`
===================================================================
M source/blender/depsgraph/DEG_depsgraph_build.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes.h
M source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
M source/blender/depsgraph/intern/builder/deg_builder_nodes_scene.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations.h
M source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
M source/blender/depsgraph/intern/builder/deg_builder_relations_scene.cc
M source/blender/depsgraph/intern/depsgraph.cc
M source/blender/depsgraph/intern/depsgraph_build.cc
M source/blender/depsgraph/intern/nodes/deg_node_component.cc
===================================================================
diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h
index c915b7ef076..b268822f659 100644
--- a/source/blender/depsgraph/DEG_depsgraph_build.h
+++ b/source/blender/depsgraph/DEG_depsgraph_build.h
@@ -141,12 +141,12 @@ void DEG_add_scene_relation(struct DepsNodeHandle *node,
struct Scene *scene,
eDepsSceneComponentType component,
const char *description);
-void DEG_add_object_relation(struct DepsNodeHandle *node, struct
- Object *ob,
+void DEG_add_object_relation(struct DepsNodeHandle *node,
+ struct Object *object,
eDepsObjectComponentType component,
const char *description);
void DEG_add_bone_relation(struct DepsNodeHandle *handle,
- struct Object *ob,
+ struct Object *object,
const char *bone_name,
eDepsObjectComponentType component,
const char *description);
@@ -164,7 +164,7 @@ typedef bool (*DEG_CollobjFilterFunction)(struct Object *obj, struct ModifierDat
void DEG_add_collision_relations(struct DepsNodeHandle *handle,
struct Scene *scene,
- struct Object *ob,
+ struct Object *object,
struct Group *group,
int layer,
unsigned int modifier_type,
@@ -173,7 +173,7 @@ void DEG_add_collision_relations(struct DepsNodeHandle *handle,
const char *name);
void DEG_add_forcefield_relations(struct DepsNodeHandle *handle,
struct Scene *scene,
- struct Object *ob,
+ struct Object *object,
struct EffectorWeights *eff,
bool add_absorption,
int skip_forcefield,
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 635354a9413..60150eda0bf 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -120,7 +120,7 @@ struct BuilderWalkUserData {
};
static void modifier_walk(void *user_data,
- struct Object * /*ob*/,
+ struct Object * /*object*/,
struct Object **obpoin,
int /*cb_flag*/)
{
@@ -309,12 +309,12 @@ void DepsgraphNodeBuilder::build_group(Base *base, Group *group)
}
}
-void DepsgraphNodeBuilder::build_object(Base *base, Object *ob)
+void DepsgraphNodeBuilder::build_object(Base *base, Object *object)
{
- const bool has_object = (ob->id.tag & LIB_TAG_DOIT);
+ const bool has_object = (object->id.tag & LIB_TAG_DOIT);
IDDepsNode *id_node = (has_object)
- ? graph_->find_id_node(&ob->id)
- : add_id_node(&ob->id);
+ ? graph_->find_id_node(&object->id)
+ : add_id_node(&object->id);
/* Update node layers.
* Do it for both new and existing ID nodes. This is so because several
* bases might be sharing same object.
@@ -322,7 +322,7 @@ void DepsgraphNodeBuilder::build_object(Base *base, Object *ob)
if (base != NULL) {
id_node->layers |= base->lay;
}
- if (ob->type == OB_CAMERA) {
+ if (object->type == OB_CAMERA) {
/* Camera should always be updated, it used directly by viewport.
*
* TODO(sergey): Make it only for active scene camera.
@@ -333,42 +333,42 @@ void DepsgraphNodeBuilder::build_object(Base *base, Object *ob)
if (has_object) {
return;
}
- ob->id.tag |= LIB_TAG_DOIT;
- ob->customdata_mask = 0;
+ object->id.tag |= LIB_TAG_DOIT;
+ object->customdata_mask = 0;
/* Standard components. */
- build_object_transform(ob);
+ build_object_transform(object);
- if (ob->parent != NULL) {
- build_object(NULL, ob->parent);
+ if (object->parent != NULL) {
+ build_object(NULL, object->parent);
}
- if (ob->modifiers.first != NULL) {
+ if (object->modifiers.first != NULL) {
BuilderWalkUserData data;
data.builder = this;
- modifiers_foreachObjectLink(ob, modifier_walk, &data);
+ modifiers_foreachObjectLink(object, modifier_walk, &data);
}
- if (ob->constraints.first != NULL) {
+ if (object->constraints.first != NULL) {
BuilderWalkUserData data;
data.builder = this;
- BKE_constraints_id_loop(&ob->constraints, constraint_walk, &data);
+ BKE_constraints_id_loop(&object->constraints, constraint_walk, &data);
}
/* Object data. */
- if (ob->data != NULL) {
+ if (object->data != NULL) {
/* type-specific data... */
- switch (ob->type) {
+ switch (object->type) {
case OB_MESH: /* Geometry */
case OB_CURVE:
case OB_FONT:
case OB_SURF:
case OB_MBALL:
case OB_LATTICE:
- build_obdata_geom(ob);
+ build_obdata_geom(object);
/* TODO(sergey): Only for until we support granular
* update of curves.
*/
- if (ob->type == OB_FONT) {
- Curve *curve = (Curve *)ob->data;
+ if (object->type == OB_FONT) {
+ Curve *curve = (Curve *)object->data;
if (curve->textoncurve) {
id_node->eval_flags |= DAG_EVAL_NEED_CURVE_PATH;
}
@@ -376,25 +376,25 @@ void DepsgraphNodeBuilder::build_object(Base *base, Object *ob)
break;
case OB_ARMATURE: /* Pose */
- if (ID_IS_LINKED(ob) && ob->proxy_from != NULL) {
- build_proxy_rig(ob);
+ if (ID_IS_LINKED(object) && object->proxy_from != NULL) {
+ build_proxy_rig(object);
}
else {
- build_rig(ob);
+ build_rig(object);
}
break;
case OB_LAMP: /* Lamp */
- build_lamp(ob);
+ build_lamp(object);
break;
case OB_CAMERA: /* Camera */
- build_camera(ob);
+ build_camera(object);
break;
default:
{
- ID *obdata = (ID *)ob->data;
+ ID *obdata = (ID *)object->data;
if ((obdata->tag & LIB_TAG_DOIT) == 0) {
build_animdata(obdata);
}
@@ -409,50 +409,50 @@ void DepsgraphNodeBuilder::build_object(Base *base, Object *ob)
* on object's level animation, for example in case of rebuilding
* pose for proxy.
*/
- build_animdata(&ob->id);
+ build_animdata(&object->id);
/* particle systems */
- if (ob->particlesystem.first != NULL) {
- build_particles(ob);
+ if (object->particlesystem.first != NULL) {
+ build_particles(object);
}
/* Grease pencil. */
- if (ob->gpd != NULL) {
- build_gpencil(ob->gpd);
+ if (object->gpd != NULL) {
+ build_gpencil(object->gpd);
}
/* Object that this is a proxy for. */
- if (ob->proxy) {
- ob->proxy->proxy_from = ob;
- build_object(base, ob->proxy);
+ if (object->proxy) {
+ object->proxy->proxy_from = object;
+ build_object(base, object->proxy);
}
/* Object dupligroup. */
- if (ob->dup_group != NULL) {
- build_group(base, ob->dup_group);
+ if (object->dup_group != NULL) {
+ build_group(base, object->dup_group);
}
}
-void DepsgraphNodeBuilder::build_object_transform(Object *ob)
+void DepsgraphNodeBuilder::build_object_transform(Object *object)
{
OperationDepsNode *op_node;
/* local transforms (from transform channels - loc/rot/scale + deltas) */
- op_node = add_operation_node(&ob->id, DEG_NODE_TYPE_TRANSFORM,
- function_bind(BKE_object_eval_local_transform, _1, scene_, ob),
+ op_node = add_operation_node(&object->id, DEG_NODE_TYPE_TRANSFORM,
+ function_bind(BKE_object_eval_local_transform, _1, scene_, object),
DEG_OPCODE_TRANSFORM_LOCAL);
op_node->set_as_entry();
/* object parent */
- if (ob->parent) {
- add_operation_node(&ob->id, DEG_NODE_TYPE_TRANSFORM,
- function_bind(BKE_object_eval_parent, _1, scene_, ob),
+ if (object->parent) {
+ add_operation_node(&object->id, DEG_NODE_TYPE_TRANSFORM,
+ function_bind(BKE_object_eval_parent, _1, scene_, object),
DEG_OPCODE_TRANSFORM_PARENT);
}
/* object constraints */
- if (ob->constraints.first) {
- build_object_constraints(ob);
+ if (object->constraints.first) {
+ build_object_constraints(object);
}
/* Temporary uber-update node, which does everything.
@@ -462,13 +462,13 @@ void DepsgraphNodeBuilder::build_object_transform(Object *ob)
*
* TODO(sergey): Get rid of this node.
*/
- add_operation_node(&ob->id, DEG_NODE_TYPE_TRANSFORM,
- function_bind(BKE_object_eval_uber_transform, _1, scene_, ob),
+ add_operation_node(&object->id, DEG_NODE_TYPE_TRANSFORM,
+ function_bind(BKE_object_eval_uber_transform, _1, scene_, object),
DEG_OPCODE_TRANSFORM_OBJECT_UBEREVAL);
/* object transform is done */
- op_node = add_operation_node(&ob->id, DEG_NODE_TYPE_TRANSFORM,
- function_bind(BKE_object_eval_done, _1, ob),
+ op_node = add_operation_node(&object->id, DEG_NODE_TYPE_TRANSFORM,
+ function_bind(BKE_object_eval_done, _1, object),
DEG_OPCODE_TRANSFORM_FINAL);
op_node->set_as_exit();
}
@@ -490,11 +490,11 @@ void DepsgraphNodeBuilder::build_object_transform(Object *ob)
*
* -- Aligorith, August 2013
*/
-void DepsgraphNodeBuilder::build_object_constraints(Object *ob)
+void DepsgraphNodeBuilder::build_object_constraints(Object *object)
{
/* create node for constraint stack */
- add_operation_node(&ob->id, DEG_NODE_TYPE_TRANSFORM,
- function_bind(BKE_object_eval_constraints, _1, scene_, ob),
+ add_operation_node(&object->id, DEG_NODE_TYPE_TRANSFORM,
+ function_bind(BKE_object_eval_constraints, _1, scene_, object),
DEG_OPCODE_TRANSFORM_CONSTRAINTS);
}
@@ -632,21 +632,21 @@ void DepsgraphNodeBuilder::build_rigidbody(Scene *scene)
/* objects - simulation participants */
if (rbw->group) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list