[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57921] branches/soc-2013-cycles_mblur/ intern/cycles: Added an ATTR_ELEMENT_VERTEX_BLOCK part to AttributeElement.

[Gavin Howard]

Revision: 57921
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57921
Author:   gdh
Date:     2013-07-02 01:46:01 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
Added an ATTR_ELEMENT_VERTEX_BLOCK part to AttributeElement. I also 
added ATTR_STD_DMOTION_PRE and ATTR_STD_DMOTION_POST to the 
AttributeStandard enum.

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-02 01:01:55 UTC (rev 57920)
+++ branches/soc-2013-cycles_mblur/intern/cycles/kernel/kernel_types.h	2013-07-02 01:46:01 UTC (rev 57921)
@@ -409,6 +409,7 @@
 	ATTR_ELEMENT_VALUE,
 	ATTR_ELEMENT_FACE,
 	ATTR_ELEMENT_VERTEX,
+	ATTR_ELEMENT_VERTEX_BLOCK,
 	ATTR_ELEMENT_CORNER,
 	ATTR_ELEMENT_CURVE,
 	ATTR_ELEMENT_CURVE_KEY
@@ -426,6 +427,8 @@
 	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-02 01:01:55 UTC (rev 57920)
+++ branches/soc-2013-cycles_mblur/intern/cycles/render/attribute.cpp	2013-07-02 01:46:01 UTC (rev 57921)
@@ -258,6 +258,12 @@
 			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;