From d42525a9b5493b758d0f19423bafc43cd335955b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20T=C3=B6nne?= <lukas.toenne@gmail.com>
Date: Fri, 31 Oct 2014 20:29:51 +0100
Subject: Reimplemented the voxel texture type for displaying hair continuum
 grids.

Conflicts:
	source/blender/physics/intern/BPH_mass_spring.cpp
---
 source/blender/render/CMakeLists.txt            | 1 +
 source/blender/render/SConscript                | 1 +
 source/blender/render/intern/source/voxeldata.c | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'source/blender/render')

diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index e516c954737..36b9f8ae362 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -33,6 +33,7 @@ set(INC
 	../imbuf
 	../makesdna
 	../makesrna
+	../physics
 	../../../intern/guardedalloc
 	../../../intern/mikktspace
 	../../../intern/smoke/extern
diff --git a/source/blender/render/SConscript b/source/blender/render/SConscript
index ebd131082e4..0cbf188525b 100644
--- a/source/blender/render/SConscript
+++ b/source/blender/render/SConscript
@@ -40,6 +40,7 @@ incs = [
     '../imbuf',
     '../makesdna',
     '../makesrna',
+    '../physics',
     '../../../intern/mikktspace',
     '../../../intern/smoke/extern',
     ]
diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index 6f3c50bca62..8bc5c7a1c8f 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -58,6 +58,7 @@
 #include "BKE_modifier.h"
 
 #include "smoke_API.h"
+#include "BPH_mass_spring.h"
 
 #include "DNA_texture_types.h"
 #include "DNA_object_force.h"
@@ -380,8 +381,7 @@ static void init_frame_hair(VoxelData *vd, int UNUSED(cfra))
 		ParticleSystemModifierData *pmd = (ParticleSystemModifierData *)md;
 		
 		if (pmd->psys && pmd->psys->clmd) {
-			// XXX TODO was moved into own subfolder, figure out how to handle this (perhaps make a wrapper in BKE)
-//			found |= implicit_hair_volume_get_texture_data(ob, pmd->psys->clmd, NULL, vd);
+			found |= BPH_cloth_solver_get_texture_data(ob, pmd->psys->clmd, vd);
 		}
 	}
 	
-- 
cgit v1.2.3