[Bf-blender-cvs] [b70c815] strand_editmode: Renamed the edithair files in BKE to editstrands.

[Lukas Tönne]

Commit: b70c815ac271927bf8ef49d9b4b927b45f8b2138
Author: Lukas Tönne
Date:   Sun Dec 7 12:26:57 2014 +0100
Branches: strand_editmode
https://developer.blender.org/rBb70c815ac271927bf8ef49d9b4b927b45f8b2138

Renamed the edithair files in BKE to editstrands.

The rationale behind this is that the BKE code could be used for
modeling hair and fur as well as a number of other features such as
grass. The primary addition to BMesh is the limitation to strand-like
topology (simple vertex chains, optionally rooted on a mesh surface).

The editor code OTOH is quite hair specific, since the result should
be suitable for hair simulation, and the workflow should mimick actual
hair grooming intuitively. Eventually the hair edit mode could become
a generalized strand edit mode with slightly different tool sets for
various purposes, but for now it is quite specifically built for hair.

Conflicts:
	source/blender/blenkernel/CMakeLists.txt
	source/blender/blenkernel/intern/particle.c

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

D	source/blender/blenkernel/BKE_edithair.h
A	source/blender/blenkernel/BKE_editstrands.h
M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/intern/customdata.c
D	source/blender/blenkernel/intern/edithair.c
A	source/blender/blenkernel/intern/editstrands.c
M	source/blender/blenkernel/intern/particle.c
M	source/blender/editors/hair/hair_edit.c
M	source/blender/editors/hair/hair_select.c
M	source/blender/editors/hair/hair_stroke.c
M	source/blender/editors/space_view3d/drawobject.c
M	source/blender/editors/space_view3d/drawstrands.c

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

diff --git a/source/blender/blenkernel/BKE_edithair.h b/source/blender/blenkernel/BKE_editstrands.h
similarity index 95%
rename from source/blender/blenkernel/BKE_edithair.h
rename to source/blender/blenkernel/BKE_editstrands.h
index 7d39ff6..309e94c 100644
--- a/source/blender/blenkernel/BKE_edithair.h
+++ b/source/blender/blenkernel/BKE_editstrands.h
@@ -25,10 +25,10 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef __BKE_EDITHAIR_H__
-#define __BKE_EDITHAIR_H__
+#ifndef __BKE_EDITSTRANDS_H__
+#define __BKE_EDITSTRANDS_H__
 
-/** \file blender/editors/hair/BKE_edithair.h
+/** \file blender/blenkernel/BKE_editstrands.h
  *  \ingroup bke
  */
 
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 54d0e4d..c14ecd0 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -92,9 +92,9 @@ set(SRC
 	intern/displist.c
 	intern/dynamicpaint.c
 	intern/editderivedmesh.c
-	intern/edithair.c
 	intern/editmesh.c
 	intern/editmesh_bvh.c
+	intern/editstrands.c
 	intern/effect.c
 	intern/fcurve.c
 	intern/fluidsim.c
@@ -213,7 +213,7 @@ set(SRC
 	BKE_depsgraph.h
 	BKE_displist.h
 	BKE_dynamicpaint.h
-	BKE_edithair.h
+	BKE_editstrands.h
 	BKE_editmesh.h
 	BKE_editmesh_bvh.h
 	BKE_effect.h
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index a5eb2c8..569af4a 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -55,7 +55,7 @@
 
 #include "BKE_customdata.h"
 #include "BKE_customdata_file.h"
-#include "BKE_edithair.h"
+#include "BKE_editstrands.h"
 #include "BKE_global.h"
 #include "BKE_main.h"
 #include "BKE_mesh_mapping.h"
diff --git a/source/blender/blenkernel/intern/edithair.c b/source/blender/blenkernel/intern/editstrands.c
similarity index 98%
rename from source/blender/blenkernel/intern/edithair.c
rename to source/blender/blenkernel/intern/editstrands.c
index 2da64f1..0edd9a7 100644
--- a/source/blender/blenkernel/intern/edithair.c
+++ b/source/blender/blenkernel/intern/editstrands.c
@@ -25,7 +25,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/editors/hair/edithair.c
+/** \file blender/blenkernel/intern/editstrands.c
  *  \ingroup bke
  */
 
@@ -42,7 +42,7 @@
 #include "BKE_bvhutils.h"
 #include "BKE_customdata.h"
 #include "BKE_cdderivedmesh.h"
-#include "BKE_edithair.h"
+#include "BKE_editstrands.h"
 #include "BKE_DerivedMesh.h"
 #include "BKE_mesh_sample.h"
 #include "BKE_particle.h"
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c
index 2243a91..69732b1 100644
--- a/source/blender/blenkernel/intern/particle.c
+++ b/source/blender/blenkernel/intern/particle.c
@@ -65,7 +65,7 @@
 #include "BKE_boids.h"
 #include "BKE_cloth.h"
 #include "BKE_colortools.h"
-#include "BKE_edithair.h"
+#include "BKE_editstrands.h"
 #include "BKE_effect.h"
 #include "BKE_global.h"
 #include "BKE_group.h"
diff --git a/source/blender/editors/hair/hair_edit.c b/source/blender/editors/hair/hair_edit.c
index 4912add..e1e335a4 100644
--- a/source/blender/editors/hair/hair_edit.c
+++ b/source/blender/editors/hair/hair_edit.c
@@ -48,7 +48,7 @@
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
 #include "BKE_DerivedMesh.h"
-#include "BKE_edithair.h"
+#include "BKE_editstrands.h"
 #include "BKE_paint.h"
 #include "BKE_particle.h"
 
diff --git a/source/blender/editors/hair/hair_select.c b/source/blender/editors/hair/hair_select.c
index 1e7c664..cfc9089 100644
--- a/source/blender/editors/hair/hair_select.c
+++ b/source/blender/editors/hair/hair_select.c
@@ -43,7 +43,7 @@
 
 #include "BKE_context.h"
 #include "BKE_depsgraph.h"
-#include "BKE_edithair.h"
+#include "BKE_editstrands.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/editors/hair/hair_stroke.c b/source/blender/editors/hair/hair_stroke.c
index ec34475..3b73955 100644
--- a/source/blender/editors/hair/hair_stroke.c
+++ b/source/blender/editors/hair/hair_stroke.c
@@ -44,7 +44,7 @@
 
 #include "BKE_brush.h"
 #include "BKE_DerivedMesh.h"
-#include "BKE_edithair.h"
+#include "BKE_editstrands.h"
 #include "BKE_mesh_sample.h"
 
 #include "bmesh.h"
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index cb98e8b..477f06e 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -58,7 +58,7 @@
 #include "BKE_DerivedMesh.h"
 #include "BKE_deform.h"
 #include "BKE_displist.h"
-#include "BKE_edithair.h"
+#include "BKE_editstrands.h"
 #include "BKE_font.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
diff --git a/source/blender/editors/space_view3d/drawstrands.c b/source/blender/editors/space_view3d/drawstrands.c
index 2c7fb09..45331bb 100644
--- a/source/blender/editors/space_view3d/drawstrands.c
+++ b/source/blender/editors/space_view3d/drawstrands.c
@@ -31,7 +31,7 @@
 #include "DNA_scene_types.h"
 #include "DNA_view3d_types.h"
 
-#include "BKE_edithair.h"
+#include "BKE_editstrands.h"
 #include "BKE_main.h"
 
 #include "bmesh.h"