New voxel texture mode "Hair", for displaying the internal hair volume

structure as a texture.

This is mostly a debugging feature that may be removed again later.

1 files changed, 26 insertions, 0 deletions

diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c
index f21a1e5fa9b..d360282d985 100644
--- a/source/blender/render/intern/source/voxeldata.c
+++ b/source/blender/render/intern/source/voxeldata.c
@@ -51,6 +51,7 @@
 #include "IMB_imbuf.h"
 #include "IMB_imbuf_types.h"
 
+#include "BKE_cloth.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
 #include "BKE_main.h"
@@ -61,6 +62,7 @@
 #include "DNA_texture_types.h"
 #include "DNA_object_force.h"
 #include "DNA_object_types.h"
+#include "DNA_particle_types.h"
 #include "DNA_modifier_types.h"
 #include "DNA_smoke_types.h"
 
@@ -364,6 +366,27 @@ static void init_frame_smoke(VoxelData *vd, int cfra)
 #endif
 }
 
+static void init_frame_hair(VoxelData *vd, int UNUSED(cfra))
+{
+	Object *ob;
+	ModifierData *md;
+	bool found = false;
+	
+	vd->dataset = NULL;
+	if (vd->object == NULL) return;
+	ob = vd->object;
+	
+	if ((md = (ModifierData *)modifiers_findByType(ob, eModifierType_ParticleSystem))) {
+		ParticleSystemModifierData *pmd = (ParticleSystemModifierData *)md;
+		
+		if (pmd->psys && pmd->psys->clmd) {
+			found |= implicit_hair_volume_get_texture_data(ob, pmd->psys->clmd, NULL, vd);
+		}
+	}
+	
+	vd->ok = found;
+}
+
 void cache_voxeldata(Tex *tex, int scene_frame)
 {	
 	VoxelData *vd = tex->vd;
@@ -397,6 +420,9 @@ void cache_voxeldata(Tex *tex, int scene_frame)
 		case TEX_VD_SMOKE:
 			init_frame_smoke(vd, scene_frame);
 			return;
+		case TEX_VD_HAIR:
+			init_frame_hair(vd, scene_frame);
+			return;
 		case TEX_VD_BLENDERVOXEL:
 			BLI_path_abs(path, G.main->name);
 			if (!BLI_exists(path)) return;