Commit: 232fb32187b05af1baec035c99cb943d1670a593
Author: Nicholas Bishop
Date: Tue Feb 10 18:37:57 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rB232fb32187b05af1baec035c99cb943d1670a593
Merge remote-tracking branch 'origin/master' into cycles-ptex-49
Conflicts:
intern/cycles/kernel/kernel_types.h
intern/cycles/render/attribute.cpp
===================================================================
===================================================================
diff --cc intern/cycles/kernel/kernel_types.h
index 19452b9,680094d..54aa2f4
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@@ -534,7 -534,7 +534,8 @@@ typedef enum AttributeStandard
ATTR_STD_VOLUME_FLAME,
ATTR_STD_VOLUME_HEAT,
ATTR_STD_VOLUME_VELOCITY,
+ ATTR_STD_POINTINESS,
+ ATTR_STD_PTEX_LAYER,
ATTR_STD_NUM,
ATTR_STD_NOT_FOUND = ~0
diff --cc intern/cycles/render/attribute.cpp
index fbd751f,656420f..22fe207
--- a/intern/cycles/render/attribute.cpp
+++ b/intern/cycles/render/attribute.cpp
@@@ -230,8 -230,8 +230,10 @@@ const char *Attribute::standard_name(At
return "heat";
case ATTR_STD_VOLUME_VELOCITY:
return "velocity";
+ case ATTR_STD_POINTINESS:
+ return "pointiness";
+ case ATTR_STD_PTEX_LAYER:
+ return "ptex_layer";
case ATTR_STD_NOT_FOUND:
case ATTR_STD_NONE:
case ATTR_STD_NUM:
@@@ -377,9 -377,9 +379,12 @@@ Attribute *AttributeSet::add(AttributeS
case ATTR_STD_VOLUME_VELOCITY:
attr = add(name, TypeDesc::TypeVector,
ATTR_ELEMENT_VOXEL);
break;
+ case ATTR_STD_POINTINESS:
+ attr = add(name, TypeDesc::TypeFloat,
ATTR_ELEMENT_VERTEX);
+ break;
+ case ATTR_STD_PTEX_LAYER:
+ attr = add(name, TypeDesc::TypeFloat,
ATTR_ELEMENT_MESH);
+ break;
default:
assert(0);
break;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
