[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58287] branches/soc-2013-cycles_mblur/ intern/cycles: Removed ATTR_STD_DMOTION_PRE and ATTR_STD_DMOTION_POST because they

[Gavin Howard]

Revision: 58287
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58287
Author:   gdh
Date:     2013-07-15 21:38:37 +0000 (Mon, 15 Jul 2013)
Log Message:
-----------
Removed ATTR_STD_DMOTION_PRE and ATTR_STD_DMOTION_POST because they 
won't be used in the current design.

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

Modified: branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h	2013-07-15 21:34:48 UTC (rev 58286)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h	2013-07-15 21:38:37 UTC (rev 58287)
@@ -427,8 +427,6 @@
 	ATTR_STD_POSITION_UNDISPLACED,
 	ATTR_STD_MOTION_PRE,
 	ATTR_STD_MOTION_POST,
-	ATTR_STD_DMOTION_PRE,
-	ATTR_STD_DMOTION_POST,
 	ATTR_STD_PARTICLE,
 	ATTR_STD_CURVE_TANGENT,
 	ATTR_STD_CURVE_INTERCEPT,

Modified: branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp
===================================================================
--- branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp	2013-07-15 21:34:48 UTC (rev 58286)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp	2013-07-15 21:38:37 UTC (rev 58287)
@@ -145,10 +145,6 @@
 		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_PARTICLE)
 		return "particle";
 	else if(std == ATTR_STD_CURVE_TANGENT)
@@ -262,12 +258,6 @@
 			case ATTR_STD_MOTION_POST:
 				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_VERTEX);
 				break;
-			case ATTR_STD_DMOTION_PRE:
-				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_VERTEX_BLOCK);
-				break;
-			case ATTR_STD_DMOTION_POST:
-				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_VERTEX_BLOCK);
-				break;
 			default:
 				assert(0);
 				break;