[Bf-blender-cvs] [843922a480a] blender2.8: Depsgraph: Prefer use anonymous structs for unused arguments
Sergey Sharybin
noreply at git.blender.org
Thu Apr 6 16:59:42 CEST 2017
Commit: 843922a480ad9edb388cb3e1c6949b77ae8f2eac
Author: Sergey Sharybin
Date: Thu Apr 6 16:58:19 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB843922a480ad9edb388cb3e1c6949b77ae8f2eac
Depsgraph: Prefer use anonymous structs for unused arguments
===================================================================
M source/blender/blenkernel/intern/armature_update.c
M source/blender/blenkernel/intern/group.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/particle_system.c
M source/blender/blenkernel/intern/rigidbody.c
===================================================================
diff --git a/source/blender/blenkernel/intern/armature_update.c b/source/blender/blenkernel/intern/armature_update.c
index 3af00629fce..771790d417a 100644
--- a/source/blender/blenkernel/intern/armature_update.c
+++ b/source/blender/blenkernel/intern/armature_update.c
@@ -50,8 +50,6 @@
#include "BKE_global.h"
#include "BKE_main.h"
-#include "DEG_depsgraph.h"
-
#define DEBUG_PRINT if (G.debug & G_DEBUG_DEPSGRAPH) printf
/* ********************** SPLINE IK SOLVER ******************* */
@@ -553,7 +551,7 @@ void BKE_splineik_execute_tree(Scene *scene, Object *ob, bPoseChannel *pchan_roo
/* *************** Depsgraph evaluation callbacks ************ */
-void BKE_pose_eval_init(EvaluationContext *UNUSED(eval_ctx),
+void BKE_pose_eval_init(struct EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob,
bPose *pose)
@@ -587,7 +585,7 @@ void BKE_pose_eval_init(EvaluationContext *UNUSED(eval_ctx),
BKE_pose_splineik_init_tree(scene, ob, ctime);
}
-void BKE_pose_eval_bone(EvaluationContext *UNUSED(eval_ctx),
+void BKE_pose_eval_bone(struct EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob,
bPoseChannel *pchan)
@@ -622,7 +620,7 @@ void BKE_pose_eval_bone(EvaluationContext *UNUSED(eval_ctx),
}
}
-void BKE_pose_constraints_evaluate(EvaluationContext *UNUSED(eval_ctx),
+void BKE_pose_constraints_evaluate(struct EvaluationContext *UNUSED(eval_ctx),
Object *ob,
bPoseChannel *pchan)
{
@@ -643,7 +641,7 @@ void BKE_pose_constraints_evaluate(EvaluationContext *UNUSED(eval_ctx),
}
}
-void BKE_pose_bone_done(EvaluationContext *UNUSED(eval_ctx),
+void BKE_pose_bone_done(struct EvaluationContext *UNUSED(eval_ctx),
bPoseChannel *pchan)
{
float imat[4][4];
@@ -654,7 +652,7 @@ void BKE_pose_bone_done(EvaluationContext *UNUSED(eval_ctx),
}
}
-void BKE_pose_iktree_evaluate(EvaluationContext *UNUSED(eval_ctx),
+void BKE_pose_iktree_evaluate(struct EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob,
bPoseChannel *rootchan)
@@ -664,7 +662,7 @@ void BKE_pose_iktree_evaluate(EvaluationContext *UNUSED(eval_ctx),
BIK_execute_tree(scene, ob, rootchan, ctime);
}
-void BKE_pose_splineik_evaluate(EvaluationContext *UNUSED(eval_ctx),
+void BKE_pose_splineik_evaluate(struct EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob,
bPoseChannel *rootchan)
@@ -674,7 +672,7 @@ void BKE_pose_splineik_evaluate(EvaluationContext *UNUSED(eval_ctx),
BKE_splineik_execute_tree(scene, ob, rootchan, ctime);
}
-void BKE_pose_eval_flush(EvaluationContext *UNUSED(eval_ctx),
+void BKE_pose_eval_flush(struct EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob,
bPose *UNUSED(pose))
@@ -689,7 +687,7 @@ void BKE_pose_eval_flush(EvaluationContext *UNUSED(eval_ctx),
ob->recalc &= ~OB_RECALC_ALL;
}
-void BKE_pose_eval_proxy_copy(EvaluationContext *UNUSED(eval_ctx), Object *ob)
+void BKE_pose_eval_proxy_copy(struct EvaluationContext *UNUSED(eval_ctx), Object *ob)
{
BLI_assert(ID_IS_LINKED_DATABLOCK(ob) && ob->proxy_from != NULL);
DEBUG_PRINT("%s on %s\n", __func__, ob->id.name);
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index 36ec02e5fb5..9d5983519d3 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -53,8 +53,6 @@
#include "BKE_object.h"
#include "BKE_scene.h" /* BKE_scene_base_find */
-#include "DEG_depsgraph.h"
-
static void free_group_object(GroupObject *go)
{
MEM_freeN(go);
@@ -314,7 +312,7 @@ static void group_replaces_nla(Object *parent, Object *target, char mode)
* you can draw everything, leaves tags in objects to signal it needs further updating */
/* note: does not work for derivedmesh and render... it recreates all again in convertblender.c */
-void BKE_group_handle_recalc_and_update(EvaluationContext *eval_ctx, Scene *scene, Object *UNUSED(parent), Group *group)
+void BKE_group_handle_recalc_and_update(struct EvaluationContext *eval_ctx, Scene *scene, Object *UNUSED(parent), Group *group)
{
GroupObject *go;
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index b4ec2fd3aec..104d1389428 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -66,8 +66,6 @@
#include "BKE_deform.h"
-#include "DEG_depsgraph.h"
-
/* Workaround for cyclic dependency with curves.
* In such case curve_cache might not be ready yet,
*/
@@ -1228,7 +1226,7 @@ void BKE_lattice_translate(Lattice *lt, float offset[3], bool do_keys)
/* **** Depsgraph evaluation **** */
-void BKE_lattice_eval_geometry(EvaluationContext *UNUSED(eval_ctx),
+void BKE_lattice_eval_geometry(struct EvaluationContext *UNUSED(eval_ctx),
Lattice *UNUSED(latt))
{
}
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 15359c2f97c..0964b957ba4 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -39,8 +39,6 @@
#include "BKE_main.h"
#include "BKE_node.h"
-#include "DEG_depsgraph.h"
-
#include "DNA_ID.h"
#include "DNA_layer_types.h"
#include "DNA_object_types.h"
@@ -1363,7 +1361,7 @@ static void idproperty_reset(IDProperty **props, IDProperty *props_ref)
}
}
-void BKE_layer_eval_layer_collection_pre(EvaluationContext *UNUSED(eval_ctx),
+void BKE_layer_eval_layer_collection_pre(struct EvaluationContext *UNUSED(eval_ctx),
Scene *scene, SceneLayer *scene_layer)
{
DEBUG_PRINT("%s on %s\n", __func__, scene_layer->name);
@@ -1376,7 +1374,7 @@ void BKE_layer_eval_layer_collection_pre(EvaluationContext *UNUSED(eval_ctx),
scene_layer->flag |= SCENE_LAYER_ENGINE_DIRTY;
}
-void BKE_layer_eval_layer_collection(EvaluationContext *UNUSED(eval_ctx),
+void BKE_layer_eval_layer_collection(struct EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
LayerCollection *layer_collection,
LayerCollection *parent_layer_collection)
@@ -1426,7 +1424,7 @@ void BKE_layer_eval_layer_collection(EvaluationContext *UNUSED(eval_ctx),
}
}
-void BKE_layer_eval_layer_collection_post(EvaluationContext *UNUSED(eval_ctx),
+void BKE_layer_eval_layer_collection_post(struct EvaluationContext *UNUSED(eval_ctx),
SceneLayer *scene_layer)
{
DEBUG_PRINT("%s on %s\n", __func__, scene_layer->name);
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 386cc9057e2..4bfdb7fbc61 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -66,7 +66,7 @@
#include "BKE_object.h"
#include "BKE_material.h"
-#include "DEG_depsgraph.h"
+//#include "DEG_depsgraph.h"
/* Functions */
@@ -323,7 +323,7 @@ void BKE_mball_properties_copy(Scene *scene, Object *active_object)
int basisnr, obnr;
char basisname[MAX_ID_NAME], obname[MAX_ID_NAME];
SceneBaseIter iter;
- EvaluationContext *eval_ctx = G.main->eval_ctx;
+ struct EvaluationContext *eval_ctx = G.main->eval_ctx;
BLI_split_name_num(basisname, &basisnr, active_object->id.name + 2, '.');
@@ -532,7 +532,7 @@ void BKE_mball_select_swap(struct MetaBall *mb)
/* **** Depsgraph evaluation **** */
-void BKE_mball_eval_geometry(EvaluationContext *UNUSED(eval_ctx),
+void BKE_mball_eval_geometry(struct EvaluationContext *UNUSED(eval_ctx),
MetaBall *UNUSED(mball))
{
}
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index e990ff7b353..4f9759742ce 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -89,8 +89,6 @@
#include "BKE_scene.h"
#include "BKE_bvhutils.h"
-#include "DEG_depsgraph.h"
-
#include "PIL_time.h"
#include "RE_shader_ext.h"
@@ -4351,7 +4349,7 @@ void BKE_particlesystem_id_loop(ParticleSystem *psys, ParticleSystemIDFunc func,
/* **** Depsgraph evaluation **** */
-void BKE_particle_system_eval(EvaluationContext *UNUSED(eval_ctx),
+void BKE_particle_system_eval(struct EvaluationContext *UNUSED(eval_ctx),
Scene *scene,
Object *ob,
ParticleSystem *psys)
diff --git a/source/blender/blenkernel/intern/rigidbody.c b/source/blender/blenkernel/intern/rigidbody.c
index 30ee2a09bbe..6618b307b63 100644
--- a/source/blender/blenkernel/intern/rigidbody.c
+++ b/source/blender/blenkernel/intern/rigidbody.c
@@ -65,8 +65,6 @@
#include "BKE_rigidbody.h"
#include "BKE_scene.h"
-#include "DEG_depsgraph.h"
-
/* ************************************** */
/* Memory Management */
@@ -1653,7 +1651,7 @@ void BKE_rigidbody_do_simulation(Scene *scene, float ctime) {}
/* -------------------- */
/* Depsgraph evaluation */
-void BKE_rigidbody_rebuild_sim(EvaluationContext *UNUSED(eval_ctx),
+void BKE_rigidbody_rebuild_sim(struct EvaluationContext *UNUSED(eval_ctx),
Scene *scene)
{
float ctime = BKE_scene_frame_get(scene);
@@ -1668,7 +1666,7 @@ void BKE_rigidbody_rebuild_sim(EvaluationContext *UNUSED(eval_ctx),
}
}
-void BKE_rigidbody_eval_simulation(EvaluationContext *UNUSED(eval_ctx),
+void BKE_rigidbody_eval_simulation(struct EvaluationContext *UNUSED(eval_ctx),
Scene *scene)
{
float ctime = BKE_scene_frame_get(scene);
@@ -1683,7 +1681,7 @@ void BKE_rigidbody_eval_simulation(EvaluationContext *UNUSED(eval_ctx),
}
}
-void B
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list