[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60170] trunk/blender/intern/cycles/render /attribute.cpp: Code cleanup / Cycles:

Thomas Dinges blender at dingto.org
Mon Sep 16 17:40:50 CEST 2013


Revision: 60170
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60170
Author:   dingto
Date:     2013-09-16 15:40:50 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
Code cleanup / Cycles:
* Avoid some duplicated code for switch/case in the Attribute code. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/attribute.cpp

Modified: trunk/blender/intern/cycles/render/attribute.cpp
===================================================================
--- trunk/blender/intern/cycles/render/attribute.cpp	2013-09-16 15:34:31 UTC (rev 60169)
+++ trunk/blender/intern/cycles/render/attribute.cpp	2013-09-16 15:40:50 UTC (rev 60170)
@@ -240,17 +240,9 @@
 				attr = add(name, TypeDesc::TypeFloat, ATTR_ELEMENT_CORNER);
 				break;
 			case ATTR_STD_GENERATED:
-				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_VERTEX);
-				break;
 			case ATTR_STD_POSITION_UNDEFORMED:
-				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_VERTEX);
-				break;
 			case ATTR_STD_POSITION_UNDISPLACED:
-				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_VERTEX);
-				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;
@@ -262,14 +254,10 @@
 	else if(curve_mesh) {
 		switch(std) {
 			case ATTR_STD_UV:
-				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_CURVE);
-				break;
 			case ATTR_STD_GENERATED:
 				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_CURVE);
 				break;
 			case ATTR_STD_MOTION_PRE:
-				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_CURVE_KEY);
-				break;
 			case ATTR_STD_MOTION_POST:
 				attr = add(name, TypeDesc::TypePoint, ATTR_ELEMENT_CURVE_KEY);
 				break;




More information about the Bf-blender-cvs mailing list