[Bf-blender-cvs] [c27284b] depsgraph_refactor: Removed old defines string defines for operation names
Joshua Leung
noreply at git.blender.org
Wed Dec 17 04:41:08 CET 2014
Commit: c27284b17721d6a4689aeb7c29216abe969ecec1
Author: Joshua Leung
Date: Mon Dec 15 02:41:55 2014 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rBc27284b17721d6a4689aeb7c29216abe969ecec1
Removed old defines string defines for operation names
===================================================================
M source/blender/depsgraph/intern/depsgraph_type_defines.cpp
M source/blender/depsgraph/intern/depsgraph_types.h
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_type_defines.cpp b/source/blender/depsgraph/intern/depsgraph_type_defines.cpp
index 0dd1362..5c3a530 100644
--- a/source/blender/depsgraph/intern/depsgraph_type_defines.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_type_defines.cpp
@@ -263,34 +263,6 @@ void BKE_curve_eval_geometry(EvaluationContext *eval_ctx, Curve *curve) {}
void BKE_curve_eval_path(EvaluationContext *eval_ctx, Curve *curve) {}
void BKE_lattice_eval_geometry(EvaluationContext *eval_ctx, Lattice *latt) {}
-const string deg_op_name_object_parent = "BKE_object_eval_parent";
-const string deg_op_name_object_local_transform = "BKE_object_eval_local_transform";
-const string deg_op_name_constraint_stack = "Constraint Stack";
-const string deg_op_name_rigidbody_world_rebuild = "Rigidbody World Rebuild";
-const string deg_op_name_rigidbody_world_simulate = "Rigidbody World Do Simulation";
-const string deg_op_name_rigidbody_object_sync = "RigidBodyObject Sync";
-const string deg_op_name_pose_eval_init = "Init Pose Eval";
-const string deg_op_name_pose_eval_flush = "Flush Pose Eval";
-const string deg_op_name_ik_solver = "IK Solver";
-const string deg_op_name_spline_ik_solver = "Spline IK Solver";
-const string deg_op_name_psys_eval = "PSys Eval";
-
-string deg_op_name_animdata(const ID *id)
-{
- AnimData *adt = BKE_animdata_from_id((ID *)id);
- return string("[AnimData] ") + id->name + string((adt->action) ? adt->action->id.name : "<None>");
-}
-
-string deg_op_name_driver(const FCurve *fcu)
-{
- return string("[Driver] ") + fcu->rna_path;
-}
-
-string deg_op_name_modifier(const ModifierData *md)
-{
- return string("[Modifier] ") + md->name;
-}
-
/* ******************************************************** */
/* External API */
diff --git a/source/blender/depsgraph/intern/depsgraph_types.h b/source/blender/depsgraph/intern/depsgraph_types.h
index 2d8c038..27076ce 100644
--- a/source/blender/depsgraph/intern/depsgraph_types.h
+++ b/source/blender/depsgraph/intern/depsgraph_types.h
@@ -95,24 +95,6 @@ typedef enum eDepsOperation_Code {
#undef DEF_DEG_OPCODE
} eDepsOperation_Code;
-/* XXX this needs to be revisited, probably operation types could be
- * combined in a concise struct with name+callback+eDepsOperation_Type
- */
-extern const string deg_op_name_object_parent;
-extern const string deg_op_name_object_local_transform;
-extern const string deg_op_name_constraint_stack;
-extern const string deg_op_name_rigidbody_world_rebuild;
-extern const string deg_op_name_rigidbody_world_simulate;
-extern const string deg_op_name_rigidbody_object_sync;
-extern const string deg_op_name_pose_eval_init;
-extern const string deg_op_name_pose_eval_flush;
-extern const string deg_op_name_ik_solver;
-extern const string deg_op_name_spline_ik_solver;
-extern const string deg_op_name_psys_eval;
-
-string deg_op_name_animdata(const ID *id);
-string deg_op_name_driver(const FCurve *driver_fcurve);
-string deg_op_name_modifier(const ModifierData *md);
/* Type of operation */
typedef enum eDepsOperation_Type {
More information about the Bf-blender-cvs
mailing list