diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 10:03:55 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-15 10:03:55 +0300 |
commit | b8b8669b282da70f4db2a89203adee014a98b204 (patch) | |
tree | 60d3e2d7293a31bfc8bbeaaf52fad29b7bf21461 /source/blender/blenkernel/intern | |
parent | e6386ed286f2e0d7a68772a24e7979b45c1c5ad7 (diff) |
Cleanup: style, warning
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/collection.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/layer.c | 6 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/collection.c b/source/blender/blenkernel/intern/collection.c index 69168c4dd3d..2f392271157 100644 --- a/source/blender/blenkernel/intern/collection.c +++ b/source/blender/blenkernel/intern/collection.c @@ -88,9 +88,7 @@ static SceneCollection *collection_add(ID *owner_id, SceneCollection *sc_parent, else { const int number = BLI_listbase_count(&sc_parent->scene_collections) + 1; const int digits = integer_digits_i(number); - const int max_len = sizeof(sc_parent->name) - - 1 /* NULL terminator */ - - (1 + digits) /* " %d" */; + const int max_len = sizeof(sc_parent->name) - 1 /* NULL terminator */ - (1 + digits) /* " %d" */; name = BLI_sprintfN("%.*s %d", max_len, sc_parent->name, number); } } diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c index cb7b72bdabd..8e7b7f5456b 100644 --- a/source/blender/blenkernel/intern/layer.c +++ b/source/blender/blenkernel/intern/layer.c @@ -569,9 +569,9 @@ struct LayerCollection *BKE_layer_collection_duplicate(struct ID *owner_id, stru layer_collection); if (layer_collections_parent != NULL) { layer_collection_new = BLI_findptr( - layer_collections_parent, - scene_collection_new, - offsetof(LayerCollection, scene_collection)); + layer_collections_parent, + scene_collection_new, + offsetof(LayerCollection, scene_collection)); break; } } |