Commit: 7fbb7e32fd4e50357ca4079b70f2917f412bcfa2
Author: Sergey Sharybin
Date: Mon Feb 3 19:33:15 2014 +0600
https://developer.blender.org/rB7fbb7e32fd4e50357ca4079b70f2917f412bcfa2
Fix T38450: Remove unused Children Offset option
This option was only exposed to the interface and internally
was doing basically nothing.
Removing it to prevent artists from being confused.
===================================================================
M release/scripts/startup/bl_ui/properties_data_curve.py
M source/blender/blenkernel/intern/object.c
M source/blender/makesdna/DNA_curve_types.h
M source/blender/makesrna/intern/rna_curve.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py
b/release/scripts/startup/bl_ui/properties_data_curve.py
index 429c207..8a3e31d 100644
--- a/release/scripts/startup/bl_ui/properties_data_curve.py
+++ b/release/scripts/startup/bl_ui/properties_data_curve.py
@@ -214,7 +214,6 @@ class DATA_PT_pathanim(CurveButtonsPanelCurve, Panel):
# these are for paths only
row = layout.row()
row.prop(curve, "use_path_follow")
- row.prop(curve, "use_time_offset", text="Offset Children")
class DATA_PT_active_spline(CurveButtonsPanelActive, Panel):
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index 53eb24b..1c49849 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1984,7 +1984,6 @@ static void ob_parcurve(Scene *scene, Object *ob, Object
*par, float mat[4][4])
{
Curve *cu;
float vec[4], dir[3], quat[4], radius, ctime;
- float timeoffs = 0.0, sf_orig = 0.0;
unit_m4(mat);
@@ -2020,15 +2019,6 @@ static void ob_parcurve(Scene *scene, Object *ob, Object
*par, float mat[4][4])
CLAMP(ctime, 0.0f, 1.0f);
}
- /* time calculus is correct, now apply distance offset */
- if (cu->flag & CU_OFFS_PATHDIST) {
- ctime += timeoffs / par->curve_cache->path->totdist;
-
- /* restore */
- SWAP(float, sf_orig, ob->sf);
- }
-
-
/* vec: 4 items! */
if (where_on_path(par, ctime, vec, dir, cu->flag & CU_FOLLOW ? quat :
NULL, &radius, NULL)) {
diff --git a/source/blender/makesdna/DNA_curve_types.h
b/source/blender/makesdna/DNA_curve_types.h
index c7b6a8c..f0c5557 100644
--- a/source/blender/makesdna/DNA_curve_types.h
+++ b/source/blender/makesdna/DNA_curve_types.h
@@ -270,7 +270,7 @@ typedef struct Curve {
#define CU_UV_ORCO 32
#define CU_DEFORM_BOUNDS_OFF 64
#define CU_STRETCH 128
-#define CU_OFFS_PATHDIST 256
+/* #define CU_OFFS_PATHDIST 256 */ /* DEPRECATED */
#define CU_FAST 512 /* Font: no filling inside editmode
*/
/* #define CU_RETOPO 1024 */ /* DEPRECATED */
#define CU_DS_EXPAND 2048
diff --git a/source/blender/makesrna/intern/rna_curve.c
b/source/blender/makesrna/intern/rna_curve.c
index f48c5be..8bcd588 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -890,12 +890,6 @@ static void rna_def_path(BlenderRNA *UNUSED(brna),
StructRNA *srna)
"Use the mesh bounds to clamp the
deformation");
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
- prop = RNA_def_property(srna, "use_time_offset", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_OFFS_PATHDIST);
- RNA_def_property_ui_text(prop, "Offset Path Distance",
- "Children will use TimeOffs value as path
distance offset");
- RNA_def_property_update(prop, 0, "rna_Curve_update_data");
-
prop = RNA_def_property(srna, "use_radius", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_PATH_RADIUS);
RNA_def_property_ui_text(prop, "Radius", "Option for paths and
curve-deform: "
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
