Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2016-02-15 16:05:44 +0300
committerCampbell Barton <ideasman42@gmail.com>2016-02-15 16:07:03 +0300
commit3e6b7d0fd874789c13aa53a62932d94cbb36163b (patch)
treecdb60c4d0d2696171ce2e7299422e85b56a5e638 /source/blender/blenloader
parent473eff2df8eecaf4cddafbfce6c8d1386d4ec68a (diff)
Fix white balance, was doing unnecessary linear conversions
This made byte & float images behave differently, where other modifiers remain the same. Also remove scene from the modifier (should have been passed as arg but no longer needed).
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/readfile.c1
-rw-r--r--source/blender/blenloader/intern/versioning_260.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 17567ae840a..cf4f18301b2 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5503,7 +5503,6 @@ static void lib_link_sequence_modifiers(FileData *fd, Scene *scene, ListBase *lb
for (smd = lb->first; smd; smd = smd->next) {
if (smd->mask_id)
smd->mask_id = newlibadr_us(fd, scene->id.lib, smd->mask_id);
- smd->scene = scene;
}
}
diff --git a/source/blender/blenloader/intern/versioning_260.c b/source/blender/blenloader/intern/versioning_260.c
index 6dd2d99ef12..907baab0aee 100644
--- a/source/blender/blenloader/intern/versioning_260.c
+++ b/source/blender/blenloader/intern/versioning_260.c
@@ -1503,7 +1503,7 @@ void blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *main)
SequenceModifierData *smd;
ColorBalanceModifierData *cbmd;
- smd = BKE_sequence_modifier_new(seq, NULL, seqModifierType_ColorBalance, scene);
+ smd = BKE_sequence_modifier_new(seq, NULL, seqModifierType_ColorBalance);
cbmd = (ColorBalanceModifierData *) smd;
cbmd->color_balance = *strip->color_balance;