[Bf-blender-cvs] [5d4b95d] temp_depsgraph_split_ubereval: Renamed functions a bit for simplicity.
Lukas Tönne
noreply at git.blender.org
Wed Sep 23 19:31:38 CEST 2015
Commit: 5d4b95da504fad7f648da7e0d5053310962f18dd
Author: Lukas Tönne
Date: Tue Sep 22 16:41:54 2015 +0200
Branches: temp_depsgraph_split_ubereval
https://developer.blender.org/rB5d4b95da504fad7f648da7e0d5053310962f18dd
Renamed functions a bit for simplicity.
Rationale is to use "eval" for all functions which are called directly from the depsgraph.
===================================================================
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/intern/object_update.c
M source/blender/depsgraph/intern/depsgraph_build_nodes.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index d594971..40d449b 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -207,15 +207,15 @@ void BKE_object_eval_data_ready(struct EvaluationContext *eval_ctx,
struct Object *ob);
void BKE_object_handle_data_update(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
-void BKE_object_handle_data_mesh_update(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
-void BKE_object_handle_data_armature_update(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
-void BKE_object_handle_data_mball_update(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
-void BKE_object_handle_data_curve_update(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
-void BKE_object_handle_data_lattice_update(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
-void BKE_object_handle_data_empty_update(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
-void BKE_object_handle_data_material_drivers(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
-void BKE_object_handle_data_lamp_drivers(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
-void BKE_object_handle_data_particles(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
+void BKE_object_eval_mesh(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
+void BKE_object_eval_armature(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
+void BKE_object_eval_mball(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
+void BKE_object_eval_curve(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
+void BKE_object_eval_lattice(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
+void BKE_object_eval_empty(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
+void BKE_object_eval_material_drivers(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
+void BKE_object_eval_lamp_drivers(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
+void BKE_object_eval_particles(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
void BKE_object_handle_update(struct EvaluationContext *eval_ctx, struct Scene *scene, struct Object *ob);
void BKE_object_handle_update_ex(struct EvaluationContext *eval_ctx,
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 553bb48..f46e137 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -156,7 +156,7 @@ void BKE_object_eval_modifier(struct EvaluationContext *eval_ctx,
(void) md; /* Ignored. */
}
-void BKE_object_handle_data_mesh_update(EvaluationContext *eval_ctx,
+void BKE_object_eval_mesh(EvaluationContext *eval_ctx,
Scene *scene,
Object *ob)
{
@@ -178,7 +178,7 @@ void BKE_object_handle_data_mesh_update(EvaluationContext *eval_ctx,
}
}
-void BKE_object_handle_data_armature_update(EvaluationContext *UNUSED(eval_ctx),
+void BKE_object_eval_armature(EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob)
{
@@ -193,28 +193,28 @@ void BKE_object_handle_data_armature_update(EvaluationContext *UNUSED(eval_ctx),
}
}
-void BKE_object_handle_data_mball_update(EvaluationContext *eval_ctx,
+void BKE_object_eval_mball(EvaluationContext *eval_ctx,
Scene *scene,
Object *ob)
{
BKE_displist_make_mball(eval_ctx, scene, ob);
}
-void BKE_object_handle_data_curve_update(EvaluationContext *UNUSED(eval_ctx),
+void BKE_object_eval_curve(EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob)
{
BKE_displist_make_curveTypes(scene, ob, 0);
}
-void BKE_object_handle_data_lattice_update(EvaluationContext *UNUSED(eval_ctx),
+void BKE_object_eval_lattice(EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob)
{
BKE_lattice_modifiers_calc(scene, ob);
}
-void BKE_object_handle_data_empty_update(EvaluationContext *UNUSED(eval_ctx),
+void BKE_object_eval_empty(EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob)
{
@@ -225,7 +225,7 @@ void BKE_object_handle_data_empty_update(EvaluationContext *UNUSED(eval_ctx),
}
}
-void BKE_object_handle_data_material_drivers(EvaluationContext *UNUSED(eval_ctx),
+void BKE_object_eval_material_drivers(EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob)
{
@@ -242,7 +242,7 @@ void BKE_object_handle_data_material_drivers(EvaluationContext *UNUSED(eval_ctx)
BLI_mutex_unlock(&material_lock);
}
-void BKE_object_handle_data_lamp_drivers(EvaluationContext *UNUSED(eval_ctx),
+void BKE_object_eval_lamp_drivers(EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob)
{
@@ -250,7 +250,7 @@ void BKE_object_handle_data_lamp_drivers(EvaluationContext *UNUSED(eval_ctx),
lamp_drivers_update(scene, ob->data, ctime);
}
-void BKE_object_handle_data_particles(EvaluationContext *eval_ctx,
+void BKE_object_eval_particles(EvaluationContext *eval_ctx,
Scene *scene,
Object *ob)
{
@@ -328,24 +328,24 @@ void BKE_object_handle_data_update(EvaluationContext *eval_ctx,
/* includes all keys and modifiers */
switch (ob->type) {
case OB_MESH:
- BKE_object_handle_data_mesh_update(eval_ctx, scene, ob);
+ BKE_object_eval_mesh(eval_ctx, scene, ob);
break;
case OB_ARMATURE:
- BKE_object_handle_data_armature_update(eval_ctx, scene, ob);
+ BKE_object_eval_armature(eval_ctx, scene, ob);
break;
case OB_MBALL:
- BKE_object_handle_data_mball_update(eval_ctx, scene, ob);
+ BKE_object_eval_mball(eval_ctx, scene, ob);
break;
case OB_CURVE:
case OB_SURF:
case OB_FONT:
- BKE_object_handle_data_curve_update(eval_ctx, scene, ob);
+ BKE_object_eval_curve(eval_ctx, scene, ob);
break;
case OB_LATTICE:
- BKE_object_handle_data_lattice_update(eval_ctx, scene, ob);
+ BKE_object_eval_lattice(eval_ctx, scene, ob);
break;
case OB_EMPTY:
- BKE_object_handle_data_empty_update(eval_ctx, scene, ob);
+ BKE_object_eval_empty(eval_ctx, scene, ob);
break;
}
@@ -355,15 +355,15 @@ void BKE_object_handle_data_update(EvaluationContext *eval_ctx,
* anymore, especially due to Cycles [#31834]
*/
if (ob->totcol) {
- BKE_object_handle_data_material_drivers(eval_ctx, scene, ob);
+ BKE_object_eval_material_drivers(eval_ctx, scene, ob);
}
else if (ob->type == OB_LAMP) {
- BKE_object_handle_data_lamp_drivers(eval_ctx, scene, ob);
+ BKE_object_eval_lamp_drivers(eval_ctx, scene, ob);
}
/* particles */
if (ob != scene->obedit && ob->particlesystem.first) {
- BKE_object_handle_data_particles(eval_ctx, scene, ob);
+ BKE_object_eval_particles(eval_ctx, scene, ob);
}
/* quick cache removed */
diff --git a/source/blender/depsgraph/intern/depsgraph_build_nodes.cc b/source/blender/depsgraph/intern/depsgraph_build_nodes.cc
index fa88f49..03c7a54 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_nodes.cc
+++ b/source/blender/depsgraph/intern/depsgraph_build_nodes.cc
@@ -911,7 +911,7 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob)
switch (ob->type) {
case OB_MESH:
add_operation_node(&ob->id, DEPSNODE_TYPE_GEOMETRY,
- DEPSOP_TYPE_EXEC, function_bind(BKE_object_handle_data_mesh_update, _1, scene, ob),
+ DEPSOP_TYPE_EXEC, function_bind(BKE_object_eval_mesh, _1, scene, ob),
DEG_OPCODE_GEOMETRY_DATA_MESH);
break;
case OB_ARMATURE:
@@ -919,31 +919,31 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob)
break;
case OB_MBALL:
add_operation_node(&ob->id, DEPSNODE_TYPE_GEOMETRY,
- DEPSOP_TYPE_EXEC, function_bind(BKE_object_handle_data_mball_update, _1, scene, ob),
+ DEPSOP_TYPE_EXEC, function_bind(BKE_object_eval_mball, _1, scene, ob),
DEG_OPCODE_GEOMETRY_DATA_MBALL);
break;
case OB_CURVE:
case OB_SURF:
case OB_FONT:
add_operation_node(&ob->id, DEPSNODE_TYPE_GEOMETRY,
- DEPSOP_TYPE_EXEC, function_bind(BKE_object_handle_data_curve_update, _1, scene, ob),
+ DEPSOP_TYPE_EXEC, function_bind(BKE_object_eval_curve, _1, scene, ob),
DEG_OPCODE_GEOMETRY_DATA_CURVE);
break;
case OB_LATTICE:
add_operation_node(&ob->id, DEPSNODE_TYPE_GEOMETRY,
- DEPSOP_TYPE_EXEC, function_bind(BKE_object_handle_data_lattice_update, _1, scene, ob),
+ DEPSOP_TYPE_EXEC, function_bind(BKE_object_eval_lattice, _1, scene, ob),
DEG_OPCODE_GEOMETRY_DATA_LATTICE);
break;
case OB_EMPTY:
add_operation_node(&ob->id, DEPSNODE_TYPE_GEOMETRY,
- DEPSOP_TYPE_EXEC, function_bind(BKE_object_handle_data_empty_update, _1, scene, ob),
+ DEPSOP_TYPE_EXEC, function_bind(BKE_object_eval_empty, _1, scene, ob),
DEG_OPCODE_GEOMETRY_DATA_EMPTY);
break;
}
if (ob != scene->obedit && ob->particlesystem.first) {
add_operation_node(&ob->id, DEPSNODE_TYPE_GEOMETRY,
- DEPSOP_TYPE_EXEC, func
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list