[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60376] branches/soc-2013-vse/source/ blender/sequencer/sequencer_types.cpp: Fixed the init bug pointed out by Schlaile.

Alexander Kuznetsov kuzsasha at gmail.com
Thu Sep 26 06:25:05 CEST 2013


Revision: 60376
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60376
Author:   alexk
Date:     2013-09-26 04:25:05 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
Fixed the init bug pointed out by Schlaile.
Also removed inline keyowrd for now. Seperating definition and declarion of the inline function results in build error on some compilers. Anyway, this file will be replaced soon.

Modified Paths:
--------------
    branches/soc-2013-vse/source/blender/sequencer/sequencer_types.cpp

Modified: branches/soc-2013-vse/source/blender/sequencer/sequencer_types.cpp
===================================================================
--- branches/soc-2013-vse/source/blender/sequencer/sequencer_types.cpp	2013-09-26 01:41:31 UTC (rev 60375)
+++ branches/soc-2013-vse/source/blender/sequencer/sequencer_types.cpp	2013-09-26 04:25:05 UTC (rev 60376)
@@ -3,17 +3,17 @@
 
 /* should be updated with the newer version when the testing is done */
 
-inline ichar& ichar::operator=(const float &rhs)
+ichar& ichar::operator=(const float &rhs)
 {
 	val = rhs < ONE ? (rhs > 0 ? (unsigned char)rhs : 0) : ONE;
 	return *this;
 }
 
-inline ichar& ichar::operator=(const ifloat &rhs)
+ichar& ichar::operator=(const ifloat &rhs)
 {
 	*this  = rhs.val;
 	return *this;
-};
+}
 
 ichar& ichar::operator=(unsigned char rhs)
 {
@@ -74,7 +74,7 @@
 
 ichar::rgba& ichar::rgba::operator=(const ifloat::rgba &rhs)
 {
-   for(size_t i; i < 4; i++)
+   for(size_t i = 0; i < 4; i++)
 	   v[i] = rhs.v[i];
 
 




More information about the Bf-blender-cvs mailing list