[Bf-blender-cvs] [097b895] master: Fix curve hide keeping spline active

Campbell Barton noreply at git.blender.org
Mon Apr 4 10:36:50 CEST 2016


Commit: 097b895c2cccf5890e4ae97bcddf6d33530ef84b
Author: Campbell Barton
Date:   Mon Apr 4 17:55:28 2016 +1000
Branches: master
https://developer.blender.org/rB097b895c2cccf5890e4ae97bcddf6d33530ef84b

Fix curve hide keeping spline active

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

M	source/blender/blenkernel/intern/curve.c

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

diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 3329d3a..4c09998 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -4256,6 +4256,7 @@ void BKE_curve_nurb_active_set(Curve *cu, const Nurb *nu)
 		cu->actnu = CU_ACT_NONE;
 	}
 	else {
+		BLI_assert(!nu->hide);
 		ListBase *nurbs = BKE_curve_editNurbs_get(cu);
 		cu->actnu = BLI_findindex(nurbs, nu);
 	}
@@ -4359,6 +4360,10 @@ void BKE_curve_nurb_vert_active_validate(Curve *cu)
 				cu->actvert = CU_ACT_NONE;
 			}
 		}
+
+		if (nu->hide) {
+			cu->actnu = CU_ACT_NONE;
+		}
 	}
 }




More information about the Bf-blender-cvs mailing list