Partial Revert: bring back some comments
This commit is contained in:
@@ -1982,6 +1982,15 @@ bool new_id(ListBase *lb, ID *id, const char *tname)
|
||||
result = check_for_dupid(lb, id, name);
|
||||
strcpy(id->name + 2, name);
|
||||
|
||||
/* This was in 2.43 and previous releases
|
||||
* however all data in blender should be sorted, not just duplicate names
|
||||
* sorting should not hurt, but noting just incase it alters the way other
|
||||
* functions work, so sort every time */
|
||||
#if 0
|
||||
if (result)
|
||||
id_sort_by_name(lb, id);
|
||||
#endif
|
||||
|
||||
id_sort_by_name(lb, id);
|
||||
|
||||
return result;
|
||||
|
||||
@@ -1155,6 +1155,17 @@ bool BKE_movieclip_has_frame(MovieClip *clip, MovieClipUser *user)
|
||||
|
||||
void BKE_movieclip_get_size(MovieClip *clip, MovieClipUser *user, int *width, int *height)
|
||||
{
|
||||
#if 0
|
||||
/* originally was needed to support image sequences with different image dimensions,
|
||||
* which might be useful for such things as reconstruction of unordered image sequence,
|
||||
* or painting/rotoscoping of non-equal-sized images, but this ended up in unneeded
|
||||
* cache lookups and even unwanted non-proxied files loading when doing mask parenting,
|
||||
* so let's disable this for now and assume image sequence consists of images with
|
||||
* equal sizes (sergey)
|
||||
* TODO(sergey): Support reading sequences of different resolution.
|
||||
*/
|
||||
if (user->framenr == clip->lastframe) {
|
||||
#endif
|
||||
if (clip->lastsize[0] != 0 && clip->lastsize[1] != 0) {
|
||||
*width = clip->lastsize[0];
|
||||
*height = clip->lastsize[1];
|
||||
|
||||
Reference in New Issue
Block a user