[Bf-blender-cvs] [600a7cd] openvdb: Fix for own commit: cycles volume slots are not the same as the index in the openvdb grids array.

Lukas Tönne noreply at git.blender.org
Fri Jun 12 12:05:11 CEST 2015


Commit: 600a7cd2bf214549b5afcf6b6c6941b84734a6ae
Author: Lukas Tönne
Date:   Fri Jun 12 12:04:19 2015 +0200
Branches: openvdb
https://developer.blender.org/rB600a7cd2bf214549b5afcf6b6c6941b84734a6ae

Fix for own commit: cycles volume slots are not the same as the index
in the openvdb grids array.

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

M	intern/cycles/render/openvdb.cpp

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

diff --git a/intern/cycles/render/openvdb.cpp b/intern/cycles/render/openvdb.cpp
index 0abf816..44468f4 100644
--- a/intern/cycles/render/openvdb.cpp
+++ b/intern/cycles/render/openvdb.cpp
@@ -125,7 +125,7 @@ int VolumeManager::find_density_slot()
 		GridDescription grid = current_grids[i];
 		
 		if (string_iequals(grid.name, "density") || string_iequals(grid.name, "density high"))
-			return (int)i;
+			return grid.slot;
 	}
 	
 	/* try using the first scalar float grid instead */




More information about the Bf-blender-cvs mailing list