[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58321] branches/soc-2013-cycles_mblur/ intern/cycles: Re-added the DMOTION_PRE and DMOTION_POST AttributeStandards .

[Gavin Howard]

Revision: 58321
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58321
Author:   gdh
Date:     2013-07-16 23:31:25 +0000 (Tue, 16 Jul 2013)
Log Message:
-----------
Re-added the DMOTION_PRE and DMOTION_POST AttributeStandards. I did this 
because Brecht told me to worry about getting deformation motion blur 
working before I worried about adding multi-step motion blur.

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-16 23:23:57 UTC (rev 58320)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h	2013-07-16 23:31:25 UTC (rev 58321)
@@ -428,6 +428,8 @@
 	ATTR_STD_MOTION,
 	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-16 23:23:57 UTC (rev 58320)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp	2013-07-16 23:31:25 UTC (rev 58321)
@@ -159,6 +159,10 @@
 		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)