[Bf-blender-cvs] [7bacb00] openvdb: Merge branch 'master' into openvdb

[Kévin Dietrich]

Commit: 7bacb0080efef531c6a01e1bfb1d33e6c9e1f51a
Author: Kévin Dietrich
Date:   Sun Nov 29 21:50:26 2015 +0100
Branches: openvdb
https://developer.blender.org/rB7bacb0080efef531c6a01e1bfb1d33e6c9e1f51a

Merge branch 'master' into openvdb

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



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

diff --cc source/blender/makesrna/intern/rna_nodetree.c
index 2962dc4,e7e8f6d..ac81d1c
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@@ -3061,21 -3078,9 +3078,21 @@@ void rna_ShaderNodePointDensity_density
  	                        *values);
  
  	/* We're done, time to clean up. */
- 	BKE_texture_pointdensity_free_data(&pd);
+ 	BKE_texture_pointdensity_free_data(pd);
  }
  
 +static void rna_ShaderNodeOpenVDB_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 +{
 +	bNodeTree *ntree = (bNodeTree *)ptr->id.data;
 +	bNode *node = (bNode *)ptr->data;
 +
 +	ntreeUpdateOpenVDBNode(bmain, ntree, node);
 +	ntreeUpdateTree(bmain, ntree);
 +	WM_main_add_notifier(NC_NODE | NA_EDITED, ntree);
 +
 +	UNUSED_VARS(scene);
 +}
 +
  #else
  
  static EnumPropertyItem prop_image_layer_items[] = {