Commit: c0dd8aecb686d0311808192e74d9b467f3c53c7b
Author: Lukas Tönne
Date: Tue Jul 29 13:47:14 2014 +0200
Branches: hair_system
https://developer.blender.org/rBc0dd8aecb686d0311808192e74d9b467f3c53c7b
Removed the unused is_dynamic property from solver points.
For the solver data it is quite important to keep the data structs
small, much more than in the DNA data.
===================================================================
M source/blender/hair/HAIR_capi.cpp
M source/blender/hair/intern/HAIR_curve.cpp
M source/blender/hair/intern/HAIR_curve.h
===================================================================
diff --git a/source/blender/hair/HAIR_capi.cpp
b/source/blender/hair/HAIR_capi.cpp
index 3c88835..438eb02 100644
--- a/source/blender/hair/HAIR_capi.cpp
+++ b/source/blender/hair/HAIR_capi.cpp
@@ -84,9 +84,8 @@ void HAIR_solver_init(struct HAIR_Solver *csolver, Scene
*scene, Object *ob, Hai
for (int k = 0; k < hair->totpoints; ++k, ++point) {
HairPoint *hair_pt = hair->points + k;
- bool is_root = (k == 0);
- *point = Point(transform_point(mat, hair_pt->rest_co),
!is_root);
+ *point = Point(transform_point(mat, hair_pt->rest_co));
point->cur.co = transform_point(mat, hair_pt->co);
point->cur.vel = transform_direction(mat, hair_pt->vel);
}
diff --git a/source/blender/hair/intern/HAIR_curve.cpp
b/source/blender/hair/intern/HAIR_curve.cpp
index 3d26ee5..3be4db3 100644
--- a/source/blender/hair/intern/HAIR_curve.cpp
+++ b/source/blender/hair/intern/HAIR_curve.cpp
@@ -32,9 +32,8 @@ Point::Point()
{
}
-Point::Point(const float3 &rest_co, bool is_dynamic) :
- rest_co(rest_co),
- is_dynamic(is_dynamic)
+Point::Point(const float3 &rest_co) :
+ rest_co(rest_co)
{
cur.co = rest_co;
cur.vel = float3(0.0f, 0.0f, 0.0f);
diff --git a/source/blender/hair/intern/HAIR_curve.h
b/source/blender/hair/intern/HAIR_curve.h
index b2c1617..f5d4850 100644
--- a/source/blender/hair/intern/HAIR_curve.h
+++ b/source/blender/hair/intern/HAIR_curve.h
@@ -40,13 +40,12 @@ struct Point {
};
Point();
- Point(const float3 &rest_co, bool is_dynamic=true);
+ Point(const float3 &rest_co);
State cur;
State next;
float3 rest_co;
- bool is_dynamic;
HAIR_CXX_CLASS_ALLOC(Point)
};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
