[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50457] branches/soc-2011-tomato: Merging r50455 through r50456 from trunk into soc-2011-tomato

[Sergey Sharybin]

Revision: 50457
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50457
Author:   nazgul
Date:     2012-09-06 16:44:27 +0000 (Thu, 06 Sep 2012)
Log Message:
-----------
Merging r50455 through r50456 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50454
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-50456

Modified: branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
===================================================================
--- branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h	2012-09-06 16:42:55 UTC (rev 50456)
+++ branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h	2012-09-06 16:44:27 UTC (rev 50457)
@@ -19,11 +19,11 @@
 #ifndef __KERNEL_TYPES_H__
 #define __KERNEL_TYPES_H__
 
+#include <string>
+
 #include "kernel_math.h"
 #include "svm/svm_types.h"
 
-#include "util_string.h"
-
 #ifndef __KERNEL_GPU__
 #define __KERNEL_CPU__
 #endif
@@ -370,28 +370,28 @@
 	ATTR_STD_NOT_FOUND = ~0
 } AttributeStandard;
 
-__device string attribute_standard_name(AttributeStandard std)
+__device std::string attribute_standard_name(AttributeStandard std)
 {
 	if(std == ATTR_STD_VERTEX_NORMAL)
-		return string("N");
+		return std::string("N");
 	else if(std == ATTR_STD_FACE_NORMAL)
-		return string("Ng");
+		return std::string("Ng");
 	else if(std == ATTR_STD_UV)
-		return string("uv");
+		return std::string("uv");
 	else if(std == ATTR_STD_GENERATED)
-		return string("generated");
+		return std::string("generated");
 	else if(std == ATTR_STD_POSITION_UNDEFORMED)
-		return string("undeformed");
+		return std::string("undeformed");
 	else if(std == ATTR_STD_POSITION_UNDISPLACED)
-		return string("undisplaced");
+		return std::string("undisplaced");
 	else if(std == ATTR_STD_MOTION_PRE)
-		return string("motion_pre");
+		return std::string("motion_pre");
 	else if(std == ATTR_STD_MOTION_POST)
-		return string("motion_post");
+		return std::string("motion_post");
 	else if(std == ATTR_STD_PARTICLE)
-		return string("particle");
+		return std::string("particle");
 	
-	return string();
+	return std::string();
 }
 
 /* Closure data */


Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50454
   + /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-50456


Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50454
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-50456