diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-23 13:42:06 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-23 13:47:47 +0300 |
| commit | 7ba1babc902b9baf460b26ac24a19497231b64b5 (patch) | |
| tree | a1c0fa2bfb1c458b0fd3f88f5f7c0c4c50ef5fd8 /source/blender/depsgraph/DEG_depsgraph_build.h | |
| parent | 99f518043537238577b332be64f83a812fbb4253 (diff) | |
| parent | f3fa5c1258d2fb08b83e080b99172ccc0dc1d67a (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/DEG_depsgraph_build.h')
| -rw-r--r-- | source/blender/depsgraph/DEG_depsgraph_build.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph_build.h b/source/blender/depsgraph/DEG_depsgraph_build.h index c85c15e2aa2..334b15cc638 100644 --- a/source/blender/depsgraph/DEG_depsgraph_build.h +++ b/source/blender/depsgraph/DEG_depsgraph_build.h @@ -136,12 +136,12 @@ void DEG_add_scene_relation(struct DepsNodeHandle *node, struct Scene *scene, eDepsSceneComponentType component, const char *description); -void DEG_add_object_relation(struct DepsNodeHandle *node, struct - Object *ob, +void DEG_add_object_relation(struct DepsNodeHandle *node, + struct Object *object, eDepsObjectComponentType component, const char *description); void DEG_add_bone_relation(struct DepsNodeHandle *handle, - struct Object *ob, + struct Object *object, const char *bone_name, eDepsObjectComponentType component, const char *description); @@ -159,7 +159,7 @@ typedef bool (*DEG_CollobjFilterFunction)(struct Object *obj, struct ModifierDat void DEG_add_collision_relations(struct DepsNodeHandle *handle, struct Scene *scene, - struct Object *ob, + struct Object *object, struct Group *group, unsigned int modifier_type, DEG_CollobjFilterFunction fn, @@ -167,7 +167,7 @@ void DEG_add_collision_relations(struct DepsNodeHandle *handle, const char *name); void DEG_add_forcefield_relations(struct DepsNodeHandle *handle, struct Scene *scene, - struct Object *ob, + struct Object *object, struct EffectorWeights *eff, bool add_absorption, int skip_forcefield, |