[Bf-blender-cvs] [fd08905] openvdb: Merge branch 'openvdb' into cvdb_ray_isect

[Kévin Dietrich]

Commit: fd08905df7b5d14d67573efac34a2e4248841a39
Author: Kévin Dietrich
Date:   Sat Jan 30 23:47:40 2016 +0100
Branches: openvdb
https://developer.blender.org/rBfd08905df7b5d14d67573efac34a2e4248841a39

Merge branch 'openvdb' into cvdb_ray_isect

Conflicts:
	intern/cycles/blender/blender_object.cpp
	intern/cycles/blender/blender_sync.h

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



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

diff --cc intern/cycles/blender/blender_object.cpp
index 646a193,1c5180a..9e2671e
--- a/intern/cycles/blender/blender_object.cpp
+++ b/intern/cycles/blender/blender_object.cpp
@@@ -73,35 -73,7 +73,35 @@@ bool BlenderSync::object_is_light(BL::O
  	return (b_ob_data && b_ob_data.is_a(&RNA_Lamp));
  }
  
- bool BlenderSync::object_has_sparse_volume(BL::Object b_ob)
++bool BlenderSync::object_has_sparse_volume(BL::Object& b_ob)
 +{
 +	BL::SmokeDomainSettings b_domain = object_smoke_domain_find(b_ob);
 +
 +	if(!b_domain) {
 +		return false;
 +	}
 +
 +	BL::PointCache b_ptcache = b_domain.point_cache();
 +
 +	if (!b_ptcache.is_baked()) {
 +	    return false;
 +	}
 +
 +	if (b_domain.cache_file_format() != BL::SmokeDomainSettings::cache_file_format_OPENVDB) {
 +	    return false;
 +	}
 +
 +#if 0
 +	char filename[1024];
 +	SmokeDomainSettings_cache_filename_get(&b_domain.ptr, filename);
 +
 +	return strcmp(filename, "");
 +#else
 +	return true;
 +#endif
 +}
 +
- static uint object_ray_visibility(BL::Object b_ob)
+ static uint object_ray_visibility(BL::Object& b_ob)
  {
  	PointerRNA cvisibility = RNA_pointer_get(&b_ob.ptr, "cycles_visibility");
  	uint flag = 0;
diff --cc intern/cycles/blender/blender_sync.h
index addf655,d3edfcb..48ff48a
--- a/intern/cycles/blender/blender_sync.h
+++ b/intern/cycles/blender/blender_sync.h
@@@ -119,11 -145,10 +145,11 @@@ private
  	void sync_images();
  
  	/* util */
- 	void find_shader(BL::ID id, vector<uint>& used_shaders, int default_shader);
- 	bool BKE_object_is_modified(BL::Object b_ob);
- 	bool object_is_mesh(BL::Object b_ob);
- 	bool object_is_light(BL::Object b_ob);
- 	bool object_has_sparse_volume(BL::Object b_ob);
+ 	void find_shader(BL::ID& id, vector<uint>& used_shaders, int default_shader);
+ 	bool BKE_object_is_modified(BL::Object& b_ob);
+ 	bool object_is_mesh(BL::Object& b_ob);
+ 	bool object_is_light(BL::Object& b_ob);
++	bool object_has_sparse_volume(BL::Object& b_ob);
  
  	/* variables */
  	BL::RenderEngine b_engine;