[Bf-blender-cvs] [035d14c] master: small typo in a code comment, fixing this before someone does it to prevent uneeded merge conflicts in branches

Dalai Felinto noreply at git.blender.org
Wed Feb 4 20:20:09 CET 2015


Commit: 035d14c029d688e21382df978e7379f990c1d653
Author: Dalai Felinto
Date:   Wed Feb 4 17:19:15 2015 -0200
Branches: master
https://developer.blender.org/rB035d14c029d688e21382df978e7379f990c1d653

small typo in a code comment, fixing this before someone does it to prevent uneeded merge conflicts in branches

===================================================================

M	source/blender/blenkernel/intern/sequencer.c

===================================================================

diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index dd46fdc..83287fe 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2796,7 +2796,7 @@ static ImBuf *do_render_strip_uncached(const SeqRenderData *context, Sequence *s
 				                         seq->strip->proxy ? seq->strip->proxy->tc : IMB_TC_RECORD_RUN,
 				                         proxy_size);
 
-				/* fetching for requested proxy sze failed, try fetching the original isntead */
+				/* fetching for requested proxy size failed, try fetching the original instead */
 				if (!ibuf && proxy_size != IMB_PROXY_NONE) {
 					ibuf = IMB_anim_absolute(seq->anim, nr + seq->anim_startofs,
 					                         seq->strip->proxy ? seq->strip->proxy->tc : IMB_TC_RECORD_RUN,




More information about the Bf-blender-cvs mailing list