[Bf-blender-cvs] [4789093] cycles_point_density: Merge branch 'master' into cycles_point_density

[Sergey Sharybin]

Commit: 478909361fecffef836154663251b2a4b39976e4
Author: Sergey Sharybin
Date:   Wed Jul 15 21:45:54 2015 +0200
Branches: cycles_point_density
https://developer.blender.org/rB478909361fecffef836154663251b2a4b39976e4

Merge branch 'master' into cycles_point_density

Conflicts:
	intern/cycles/kernel/svm/svm.h
	source/blender/blenkernel/intern/particle_system.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/makesrna/intern/rna_nodetree.c
	source/blenderplayer/bad_level_call_stubs/stubs.c

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



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

diff --cc intern/cycles/kernel/svm/svm.h
index a67b09d,15ac651..0f45a8b
--- a/intern/cycles/kernel/svm/svm.h
+++ b/intern/cycles/kernel/svm/svm.h
@@@ -370,68 -445,12 +446,15 @@@ 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
- 			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
- 			case NODE_TANGENT:
- 				svm_node_tangent(kg, sd, stack, node);
- 				break;
- 			case NODE_NORMAL_MAP:
- 				svm_node_normal_map(kg, sd, stack, node);
- 				break;
 +			case NODE_TEX_VOXEL:
 +				svm_node_tex_voxel(kg, sd, stack, node, &offset);
 +				break;
+ #  endif  /* __EXTRA_NODES__ */
+ #endif  /* NODES_GROUP(NODE_GROUP_LEVEL_3) */
  			case NODE_END:
+ 				return;
  			default:
+ 				kernel_assert(!"Unknown node type was passed to the SVM machine");
  				return;
  		}
  	}
diff --cc intern/cycles/render/nodes.h
index e3df573,7ec20f0..5a41291
--- a/intern/cycles/render/nodes.h
+++ b/intern/cycles/render/nodes.h
@@@ -181,31 -209,10 +209,33 @@@ public
  	
  	float offset, squash;
  	int offset_frequency, squash_frequency;
+ 
+ 	virtual int get_group() { return NODE_GROUP_LEVEL_2; }
  };
  
 +class PointDensityTextureNode : public ShaderNode {
 +public:
 +	SHADER_NODE_NO_CLONE_CLASS(PointDensityTextureNode)
 +
 +	~PointDensityTextureNode();
 +	ShaderNode *clone() const;
 +	void attributes(Shader *shader, AttributeRequestSet *attributes);
 +
 +	bool has_spatial_varying() { return true; }
 +	bool has_object_dependency() { return true; }
 +
 +	ImageManager *image_manager;
 +	int slot;
 +	string filename;
 +	ustring space;
 +	void *builtin_data;
 +	InterpolationType interpolation;
 +
 +	Transform tfm;
 +
 +	static ShaderEnum space_enum;
 +};
 +
  class MappingNode : public ShaderNode {
  public:
  	SHADER_NODE_CLASS(MappingNode)
diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
index ebdf7ab,9a9513e..5f1b0a6
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@@ -622,7 -626,7 +626,8 @@@ void RE_engine_update_memory_stats(stru
  struct RenderEngine *RE_engine_create(struct RenderEngineType *type) RET_NULL
  void RE_engine_frame_set(struct RenderEngine *engine, int frame, float subframe) RET_NONE
  void RE_FreePersistentData(void) RET_NONE
 +void RE_sample_point_density(struct Scene *scene, struct PointDensity *pd, int resolution, float *values) RET_NONE;
+ void RE_instance_get_particle_info(struct ObjectInstanceRen *obi, float *index, float *age, float *lifetime, float co[3], float *size, float vel[3], float angvel[3]) RET_NONE
  
  /* python */
  struct wmOperatorType *WM_operatortype_find(const char *idname, bool quiet) RET_NULL