diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-12-04 09:19:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-12-04 09:20:26 +0300 |
commit | 9dfbd98339984e885c3b48142c97f3b516520e73 (patch) | |
tree | c70bf74f74d728fb3fb9918f1b402682b13f3eeb /source/blender/blenkernel | |
parent | 1b2f8b27540f6154dc968f216297ab9badccd271 (diff) |
Cleanup: whitespace
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_layer.h | 7 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 15 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 4 |
3 files changed, 16 insertions, 10 deletions
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h index 55337fa5ed0..e4f8b8790f6 100644 --- a/source/blender/blenkernel/BKE_layer.h +++ b/source/blender/blenkernel/BKE_layer.h @@ -76,9 +76,10 @@ struct Base *BKE_view_layer_base_find(struct ViewLayer *view_layer, struct Objec void BKE_view_layer_base_deselect_all(struct ViewLayer *view_layer); void BKE_view_layer_base_select(struct ViewLayer *view_layer, struct Base *selbase); -void BKE_view_layer_copy_data(struct ViewLayer *view_layer_dst, struct ViewLayer *view_layer_src, - struct SceneCollection* mc_dst, struct SceneCollection* mc_src, - const int flag); +void BKE_view_layer_copy_data( + struct ViewLayer *view_layer_dst, struct ViewLayer *view_layer_src, + struct SceneCollection *mc_dst, struct SceneCollection *mc_src, + const int flag); void BKE_layer_collection_free(struct ViewLayer *view_layer, struct LayerCollection *lc); diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index 363dc53496f..84eb4ee2e33 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -142,7 +142,9 @@ ViewLayer *BKE_view_layer_add(Scene *scene, const char *name) BLI_addtail(&scene->view_layers, view_layer); /* unique name */ - BLI_uniquename(&scene->view_layers, view_layer, DATA_("ViewLayer"), '.', offsetof(ViewLayer, name), sizeof(view_layer->name)); + BLI_uniquename( + &scene->view_layers, view_layer, DATA_("ViewLayer"), '.', + offsetof(ViewLayer, name), sizeof(view_layer->name)); return view_layer; } @@ -325,7 +327,8 @@ void BKE_view_layer_base_select(struct ViewLayer *view_layer, Base *selbase) /* Copying functions for datablocks that use ViewLayer/SceneCollection */ /* Find the equivalent SceneCollection in the new tree */ -static SceneCollection *scene_collection_from_new_tree(SceneCollection *sc_reference, SceneCollection *sc_dst, SceneCollection *sc_src) +static SceneCollection *scene_collection_from_new_tree( + SceneCollection *sc_reference, SceneCollection *sc_dst, SceneCollection *sc_src) { if (sc_src == sc_reference) { return sc_dst; @@ -387,8 +390,9 @@ static void layer_collections_recreate( * \param mc_dst Master Collection the destination ViewLayer links in. * \param flag Copying options (see BKE_library.h's LIB_ID_COPY_... flags for more). */ -void BKE_view_layer_copy_data(ViewLayer *view_layer_dst, ViewLayer *view_layer_src, SceneCollection* mc_dst, SceneCollection* mc_src, - const int flag) +void BKE_view_layer_copy_data( + ViewLayer *view_layer_dst, ViewLayer *view_layer_src, SceneCollection *mc_dst, SceneCollection *mc_src, + const int flag) { IDPropertyTemplate val = {0}; @@ -761,7 +765,8 @@ bool BKE_layer_collection_move_into(const ID *owner_id, LayerCollection *lc_dst, } } - LayerCollection *lc_new = BLI_findptr(&lc_dst->layer_collections, lc_src->scene_collection, offsetof(LayerCollection, scene_collection)); + LayerCollection *lc_new = BLI_findptr( + &lc_dst->layer_collections, lc_src->scene_collection, offsetof(LayerCollection, scene_collection)); BLI_assert(lc_new); layer_collection_swap(view_layer, &lc_dst->layer_collections, NULL, lc_new, lc_src); diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index b3d7e2affd3..c095236733f 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -2212,8 +2212,8 @@ Depsgraph *BKE_scene_get_depsgraph(Scene *scene, Depsgraph **depsgraph_ptr; if (!BLI_ghash_ensure_p_ex(scene->depsgraph_hash, &key, - (void***)&key_ptr, - (void***)&depsgraph_ptr)) + (void ***)&key_ptr, + (void ***)&depsgraph_ptr)) { *key_ptr = MEM_mallocN(sizeof(DepsgraphKey), __func__); **key_ptr = key; |