diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 20:33:55 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-25 20:33:55 +0300 |
| commit | bcc020b1bc1b60f6cbd6d2c9bf400744931e57e1 (patch) | |
| tree | fef4d83d0e5addb59c8389adf125281a4c7e35f8 /source/blender/blenkernel/BKE_camera.h | |
| parent | 99bb1accbbb8e1ba38f30b073b22deb107bf3220 (diff) | |
| parent | 3f36cd3f33e52d53d82a3a221e2a576cf26390a5 (diff) | |
Merge branch 'asset-engine' into asset-experimentsasset-experiments
Conflicts:
source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/blenkernel/BKE_camera.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_camera.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_camera.h b/source/blender/blenkernel/BKE_camera.h index 97f4b30894b..31a732cf7e5 100644 --- a/source/blender/blenkernel/BKE_camera.h +++ b/source/blender/blenkernel/BKE_camera.h @@ -53,7 +53,7 @@ struct GPUFXSettings; void BKE_camera_init(struct Camera *cam); void *BKE_camera_add(struct Main *bmain, const char *name); struct Camera *BKE_camera_copy(struct Main *bmain, struct Camera *cam); -void BKE_camera_make_local(struct Main *bmain, struct Camera *cam); +void BKE_camera_make_local(struct Main *bmain, struct Camera *cam, const bool lib_local); void BKE_camera_free(struct Camera *ca); /* Camera Usage */ |