[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37439] branches/soc-2011-salad: Merging r37437 through r37438 from soc-2011-tomato into soc-2011-salad

Sergey Sharybin g.ulairi at gmail.com
Sun Jun 12 22:14:24 CEST 2011


Revision: 37439
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37439
Author:   nazgul
Date:     2011-06-12 20:14:23 +0000 (Sun, 12 Jun 2011)
Log Message:
-----------
Merging r37437 through r37438 from soc-2011-tomato into soc-2011-salad

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37437
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37438

Modified Paths:
--------------
    branches/soc-2011-salad/source/blender/blenkernel/intern/movieclip.c

Property Changed:
----------------
    branches/soc-2011-salad/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37387
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37436
/trunk/blender:36834-37436
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-37387
/branches/soc-2011-pepper:36830-37151
/branches/soc-2011-tomato:36831-37438
/trunk/blender:36834-37436

Modified: branches/soc-2011-salad/source/blender/blenkernel/intern/movieclip.c
===================================================================
--- branches/soc-2011-salad/source/blender/blenkernel/intern/movieclip.c	2011-06-12 20:13:06 UTC (rev 37438)
+++ branches/soc-2011-salad/source/blender/blenkernel/intern/movieclip.c	2011-06-12 20:14:23 UTC (rev 37439)
@@ -77,7 +77,7 @@
 
 static int sequence_guess_offset(const char *full_name, int head_len, int numlen)
 {
-	char num[FILE_MAX];
+	char num[FILE_MAX]= {0};
 
 	strncpy(num, full_name+head_len, numlen);
 




More information about the Bf-blender-cvs mailing list