[Bf-blender-cvs] [00e0470] depsgraph_refactor: Depsgraph: code cleanup, blender uses floats for time, not doubles

Sergey Sharybin noreply at git.blender.org
Mon Mar 16 15:56:23 CET 2015


Commit: 00e04704779da40dbafb159ab73a63132ed71f40
Author: Sergey Sharybin
Date:   Mon Mar 16 19:55:59 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB00e04704779da40dbafb159ab73a63132ed71f40

Depsgraph: code cleanup,blender uses floats for time, not doubles

===================================================================

M	source/blender/depsgraph/DEG_depsgraph.h
M	source/blender/depsgraph/intern/depsgraph_eval.cpp
M	source/blender/depsgraph/intern/depsgraph_eval.h
M	source/blender/depsgraph/intern/depsnode.h

===================================================================

diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h
index 242705f..3ac42aa 100644
--- a/source/blender/depsgraph/DEG_depsgraph.h
+++ b/source/blender/depsgraph/DEG_depsgraph.h
@@ -169,7 +169,7 @@ void DEG_evaluation_context_free(struct EvaluationContext *eval_ctx);
 void DEG_evaluate_on_framechange(struct EvaluationContext *eval_ctx,
                                  struct Main *bmain,
                                  Depsgraph *graph,
-                                 double ctime,
+                                 float ctime,
                                  const int layer);
 
 /* Data changed recalculation entrypoint.
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cpp b/source/blender/depsgraph/intern/depsgraph_eval.cpp
index 74e71ae..b8de71a 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cpp
@@ -358,7 +358,7 @@ void DEG_evaluate_on_refresh(EvaluationContext *eval_ctx,
 void DEG_evaluate_on_framechange(EvaluationContext *eval_ctx,
                                  Main *bmain,
                                  Depsgraph *graph,
-                                 double ctime,
+                                 float ctime,
                                  const int layers)
 {
 	/* Update time on primary timesource. */
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.h b/source/blender/depsgraph/intern/depsgraph_eval.h
index 2fc2634..a5664f6 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.h
+++ b/source/blender/depsgraph/intern/depsgraph_eval.h
@@ -53,7 +53,7 @@ typedef struct DEG_OperationsContext {
 	struct Main *bmain;   /* scene database to query data from (if needed) */
 	struct Scene *scene;  /* current scene we're working with */
 
-	double cfra;          /* current frame (including subframe offset stuff) */
+	float cfra;           /* current frame (including subframe offset stuff) */
 
 	int type;             /* (eDepsNode_Type.OuterNodes) component type <-> context type (for debug purposes) */
 	short utype;          /* (eDEG_OperationContext_UserType) evaluation user type */
diff --git a/source/blender/depsgraph/intern/depsnode.h b/source/blender/depsgraph/intern/depsnode.h
index 8c153ec..77acfdd 100644
--- a/source/blender/depsgraph/intern/depsnode.h
+++ b/source/blender/depsgraph/intern/depsnode.h
@@ -112,12 +112,11 @@ struct IDDepsNode;
 
 /* Time Source Node. */
 struct TimeSourceDepsNode : public DepsNode {
-	/* TODO(sergey): Time in blender is float, not double. */
 	/* New "current time". */
-	double cfra;
+	float cfra;
 
 	/* time-offset relative to the "official" time source that this one has. */
-	double offset;
+	float offset;
 
 	// TODO: evaluate() operation needed




More information about the Bf-blender-cvs mailing list