diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:07:19 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-05 16:12:28 +0300 |
commit | 58dc114615449b8fc13e3b05ec3c21390547f5c7 (patch) | |
tree | 1d0ff6108d39c3bbcc98e0443e3a437ec5a97399 /source/blender/blenkernel | |
parent | d2ea1b2dcd536cc8a9e53bd830f0095f6bf9e2fe (diff) | |
parent | 18d7fbe4f58c86f6f91b1e9e5c1f7f0c593a1d0f (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_library.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library.c | 7 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library_query.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pbvh_bmesh.c | 2 |
6 files changed, 7 insertions, 12 deletions
diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index eac4dc81582..f320597ef2d 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -151,7 +151,7 @@ void id_sort_by_name(struct ListBase *lb, struct ID *id); void BKE_id_expand_local(struct Main *bmain, struct ID *id); void BKE_id_copy_ensure_local(struct Main *bmain, const struct ID *old_id, struct ID *new_id); -bool new_id(struct ListBase *lb, struct ID *id, const char *name); +bool new_id(struct ListBase *lb, struct ID *id, const char *name) ATTR_NONNULL(1, 2); void id_clear_lib_data(struct Main *bmain, struct ID *id); void id_clear_lib_data_ex(struct Main *bmain, struct ID *id, const bool id_in_mainlist); diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 88a15d1fe3b..ba9ccf94303 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -3591,8 +3591,8 @@ static bool tridiagonal_solve_with_limits(float *a, float *b, float *c, float *d * This function computes the handles of a series of auto bezier points * on the basis of 'no acceleration discontinuities' at the points. * The first and last bezier points are considered 'fixed' (their handles are not touched) - * The result is the smoothest possible trajectory going through intemediate points. - * The difficulty is that the handles depends on their neighbours. + * The result is the smoothest possible trajectory going through intermediate points. + * The difficulty is that the handles depends on their neighbors. * * The exact solution is found by solving a tridiagonal matrix equation formed * by the continuity and boundary conditions. Although theoretically handle position diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 667352b6ddb..cb045f7bae2 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -1806,10 +1806,6 @@ bool new_id(ListBase *lb, ID *id, const char *tname) if (ID_IS_LINKED_DATABLOCK(id)) return false; - /* if no libdata given, look up based on ID */ - if (lb == NULL) - lb = which_libbase(G.main, GS(id->name)); - /* if no name given, use name of current ID * else make a copy (tname args can be const) */ if (tname == NULL) @@ -1964,7 +1960,7 @@ static void library_make_local_copying_check(ID *id, GSet *loop_tags, MainIDRela * * Current version uses regular id_make_local callback, with advanced pre-processing step to detect all cases of * IDs currently indirectly used, but which will be used by local data only once this function is finished. - * This allows to avoid any uneeded duplication of IDs, and hence all time lost afterwards to remove + * This allows to avoid any unneeded duplication of IDs, and hence all time lost afterwards to remove * orphaned linked data-blocks... */ void BKE_library_make_local( @@ -2353,7 +2349,6 @@ void BLI_libblock_ensure_unique_name(Main *bmain, const char *name) ListBase *lb; ID *idtest; - lb = which_libbase(bmain, GS(name)); if (lb == NULL) return; diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c index e397dcf7667..e3706f7aedf 100644 --- a/source/blender/blenkernel/intern/library_query.c +++ b/source/blender/blenkernel/intern/library_query.c @@ -380,7 +380,7 @@ void BKE_library_foreach_ID_link(Main *bmain, ID *id, LibraryIDLinkCallback call if (bmain != NULL && bmain->relations != NULL && (flag & IDWALK_READONLY)) { /* Note that this is minor optimization, even in worst cases (like id being an object with lots of * drivers and constraints and modifiers, or material etc. with huge node tree), - * but we might as well use it (Main->relations is always assumed valid, it's responsability of code + * but we might as well use it (Main->relations is always assumed valid, it's responsibility of code * creating it to free it, especially if/when it starts modifying Main database). */ MainIDRelationsEntry *entry = BLI_ghash_lookup(bmain->relations->id_user_to_used, id); for (; entry != NULL; entry = entry->next) { diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 3ff4885f7fc..beecb063a20 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1325,7 +1325,7 @@ void ntreeUserDecrefID(bNodeTree *ntree) /* *************** Node Preview *********** */ /* XXX this should be removed eventually ... - * Currently BKE functions are modelled closely on previous code, + * Currently BKE functions are modeled closely on previous code, * using BKE_node_preview_init_tree to set up previews for a whole node tree in advance. * This should be left more to the individual node tree implementations. */ diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c index 187891e7210..e77edb21798 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.c +++ b/source/blender/blenkernel/intern/pbvh_bmesh.c @@ -1172,7 +1172,7 @@ static void pbvh_bmesh_split_edge( * * - faces wind anticlockwise in this example. * - original edge is ``(v1, v2)`` - * - oroginal face is ``(v1, v2, v3)`` + * - original face is ``(v1, v2, v3)`` * * <pre> * + v3(v_opp) |