[Bf-blender-cvs] [7b1de2b407] blender2.8: Revert "Depsgraph: Add placeholder function to handle objects update"
Dalai Felinto
noreply at git.blender.org
Thu Mar 2 13:06:16 CET 2017
Commit: 7b1de2b407beb5f73e6d18b61a49c5b39ed05873
Author: Dalai Felinto
Date: Thu Mar 2 13:05:17 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB7b1de2b407beb5f73e6d18b61a49c5b39ed05873
Revert "Depsgraph: Add placeholder function to handle objects update"
This reverts commit 9023abbf27c4efcdba3d9bd7c884680e56e4d9cb.
===================================================================
M source/blender/blenkernel/BKE_object.h
M source/blender/blenkernel/intern/object_update.c
M source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
===================================================================
diff --git a/source/blender/blenkernel/BKE_object.h b/source/blender/blenkernel/BKE_object.h
index b3b67d0924..890a8fc069 100644
--- a/source/blender/blenkernel/BKE_object.h
+++ b/source/blender/blenkernel/BKE_object.h
@@ -200,7 +200,6 @@ void BKE_object_eval_uber_transform(struct EvaluationContext *eval_ctx,
void BKE_object_eval_uber_data(struct EvaluationContext *eval_ctx,
struct Scene *scene,
struct Object *ob);
-void BKE_object_eval_shading(struct EvaluationContext *eval_ctx, struct Object *ob);
void BKE_object_handle_data_update(struct EvaluationContext *eval_ctx,
struct Scene *scene,
diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index c0b550ef08..8345f1a4c4 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -348,8 +348,3 @@ void BKE_object_eval_uber_data(EvaluationContext *eval_ctx,
ob->recalc &= ~(OB_RECALC_DATA | OB_RECALC_TIME);
}
-
-void BKE_object_eval_shading(EvaluationContext *UNUSED(eval_ctx), Object *ob)
-{
- DEBUG_PRINT("%s on %s\n", __func__, ob->id.name);
-}
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
index 0f0d16907f..df6fc18c7e 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
@@ -835,8 +835,8 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene, Object *ob)
add_operation_node(&ob->id,
DEPSNODE_TYPE_SHADING,
DEPSOP_TYPE_EXEC,
- function_bind(BKE_object_eval_shading, _1, ob),
- DEG_OPCODE_OPERATION, "Material Update");
+ NULL,
+ DEG_OPCODE_PLACEHOLDER, "Material Update");
}
/* geometry collision */
More information about the Bf-blender-cvs
mailing list