[Bf-blender-cvs] [5ca5009] openvdb: Merge branch 'master' into openvdb_smoke

[Kévin Dietrich]

Commit: 5ca5009e15924d854b8b97c8293ee95e54ad7846
Author: Kévin Dietrich
Date:   Wed Jun 3 20:57:50 2015 +0200
Branches: openvdb
https://developer.blender.org/rB5ca5009e15924d854b8b97c8293ee95e54ad7846

Merge branch 'master' into openvdb_smoke

===================================================================



===================================================================

diff --cc intern/cycles/kernel/svm/svm.h
index 4a49154,15ac651..14be4a9
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@@ -379,70 -445,12 +446,17 @@@ ccl_device_noinline void svm_eval_nodes
  			case NODE_BLACKBODY:
  				svm_node_blackbody(kg, sd, stack, node.y, node.z);
  				break;
- 			case NODE_SET_DISPLACEMENT:
- 				svm_node_set_displacement(sd, stack, node.y);
- 				break;
- 			case NODE_SET_BUMP:
- 				svm_node_set_bump(kg, sd, stack, node);
- 				break;
- 			case NODE_MATH:
- 				svm_node_math(kg, sd, stack, node.y, node.z, node.w, &offset);
- 				break;
- 			case NODE_VECTOR_MATH:
- 				svm_node_vector_math(kg, sd, stack, node.y, node.z, node.w, &offset);
- 				break;
- 			case NODE_VECTOR_TRANSFORM:
- 				svm_node_vector_transform(kg, sd, stack, node);
- 				break;
- 			case NODE_NORMAL:
- 				svm_node_normal(kg, sd, stack, node.y, node.z, node.w, &offset);
- 				break;
- #endif  /* __EXTRA_NODES__ */
- 			case NODE_MAPPING:
- 				svm_node_mapping(kg, sd, stack, node.y, node.z, &offset);
- 				break;
- 			case NODE_MIN_MAX:
- 				svm_node_min_max(kg, sd, stack, node.y, node.z, &offset);
- 				break;
- 			case NODE_TEX_COORD:
- 				svm_node_tex_coord(kg, sd, path_flag, stack, node, &offset);
- 				break;
- #ifdef __EXTRA_NODES__
- 			case NODE_TEX_COORD_BUMP_DX:
- 				svm_node_tex_coord_bump_dx(kg, sd, path_flag, stack, node, &offset);
- 				break;
- 			case NODE_TEX_COORD_BUMP_DY:
- 				svm_node_tex_coord_bump_dy(kg, sd, path_flag, stack, node, &offset);
- 				break;
- 			case NODE_CLOSURE_SET_NORMAL:
- 				svm_node_set_normal(kg, sd, stack, node.y, node.z );
- 				break;
- 			case NODE_RGB_RAMP:
- 				svm_node_rgb_ramp(kg, sd, stack, node, &offset);
- 				break;
- 			case NODE_RGB_CURVES:
- 				svm_node_rgb_curves(kg, sd, stack, node, &offset);
- 				break;
- 			case NODE_VECTOR_CURVES:
- 				svm_node_vector_curves(kg, sd, stack, node, &offset);
- 				break;
- 			case NODE_LIGHT_FALLOFF:
- 				svm_node_light_falloff(sd, stack, node);
- 				break;
- #endif  /* __EXTRA_NODES__ */
- 			case NODE_TANGENT:
- 				svm_node_tangent(kg, sd, stack, node);
- 				break;
- 			case NODE_NORMAL_MAP:
- 				svm_node_normal_map(kg, sd, stack, node);
- 				break;
+ #  endif  /* __EXTRA_NODES__ */
+ #endif  /* NODES_GROUP(NODE_GROUP_LEVEL_3) */
 +#ifdef __OPENVDB__
 +			case NODE_OPENVDB:
 +				svm_node_openvdb(kg, sd, stack, node, &offset);
 +				break;
 +#endif
  			case NODE_END:
+ 				return;
  			default:
+ 				kernel_assert(!"Unknown node type was passed to the SVM machine");
  				return;
  		}
  	}