[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58559] branches/soc-2013-cycles_mblur/ intern/cycles/render/attribute.cpp: Fix for another build error.

[Gavin Howard]

Revision: 58559
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58559
Author:   gdh
Date:     2013-07-24 03:28:44 +0000 (Wed, 24 Jul 2013)
Log Message:
-----------
Fix for another build error.

I need to get in the habit of building before committing. Ouch! I hope 
you all will forgive me because this is the first collaborative project 
I've done.

Modified Paths:
--------------
    branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp

Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp	2013-07-24 00:32:26 UTC (rev 58558)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp	2013-07-24 03:28:44 UTC (rev 58559)
@@ -153,16 +153,12 @@
 		return "undeformed";
 	else if(std == ATTR_STD_POSITION_UNDISPLACED)
 		return "undisplaced";
-	else if(std == ATTR_STD_MOTION)
-		return "motion";
 	else if(std == ATTR_STD_MOTION_PRE)
 		return "motion_pre";
 	else if(std == ATTR_STD_MOTION_POST)
 		return "motion_post";
-	else if(std == ATTR_STD_DMOTION_PRE)
-		return "deform_motion_pre";
-	else if(std == ATTR_STD_DMOTION_POST)
-		return "deform_motion_post";
+	else if(std == ATTR_STD_DMOTION)
+		return "deform_motion";
 	else if(std == ATTR_STD_PARTICLE)
 		return "particle";
 	else if(std == ATTR_STD_CURVE_TANGENT)
@@ -270,15 +266,15 @@
 			case ATTR_STD_POSITION_UNDISPLACED:
 				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_VERTEX);
 				break;
-			case ATTR_STD_MOTION:
-				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_VERTEX_STEPS);
-				break;
 			case ATTR_STD_MOTION_PRE:
 				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_VERTEX);
 				break;
 			case ATTR_STD_MOTION_POST:
 				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_VERTEX);
 				break;
+			case ATTR_STD_DMOTION:
+				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_VERTEX_STEPS);
+				break;
 			default:
 				assert(0);
 				break;