[Bf-blender-cvs] [442748d] openvdb: Fix for crash on NULL pointer if using the high density grid for rendering.

Kévin Dietrich noreply at git.blender.org
Tue Jun 9 02:02:58 CEST 2015


Commit: 442748dfcd914c4625550dbc5b2ccc0488bbb631
Author: Kévin Dietrich
Date:   Mon Jun 8 22:22:10 2015 +0200
Branches: openvdb
https://developer.blender.org/rB442748dfcd914c4625550dbc5b2ccc0488bbb631

Fix for crash on NULL pointer if using the high density grid for
rendering.

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

M	intern/cycles/render/openvdb.cpp

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

diff --git a/intern/cycles/render/openvdb.cpp b/intern/cycles/render/openvdb.cpp
index 1410e79..5635271 100644
--- a/intern/cycles/render/openvdb.cpp
+++ b/intern/cycles/render/openvdb.cpp
@@ -70,7 +70,7 @@ int VolumeManager::add_volume(const string& filename, const string& name, int sa
 			slot = add_openvdb_volume(filename, name, sampling, grid_type);
 		}
 
-		if(string_iequals(name, "density")) {
+		if(string_iequals(name, "density") || string_iequals(name, "density high")) {
 			density_index = slot;
 		}




More information about the Bf-blender-cvs mailing list