[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28519] trunk/blender: Fix [#22207] Selecting Roots also selects hidden

[Matt Ebb]

Revision: 28519
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28519
Author:   broken
Date:     2010-04-30 03:22:21 +0200 (Fri, 30 Apr 2010)

Log Message:
-----------
Fix [#22207] Selecting Roots also selects hidden

Modified Paths:
--------------
    trunk/blender/release/scripts/ui/space_view3d.py
    trunk/blender/source/blender/editors/physics/particle_edit.c
    trunk/blender/source/blender/editors/physics/physics_intern.h
    trunk/blender/source/blender/editors/physics/physics_ops.c

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2010-04-29 23:54:41 UTC (rev 28518)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2010-04-30 01:22:21 UTC (rev 28519)
@@ -453,8 +453,8 @@
 
         layout.separator()
 
-        layout.operator("particle.select_first", text="Roots")
-        layout.operator("particle.select_last", text="Tips")
+        layout.operator("particle.select_roots", text="Roots")
+        layout.operator("particle.select_tips", text="Tips")
 
 
 class VIEW3D_MT_select_edit_mesh(bpy.types.Menu):

Modified: trunk/blender/source/blender/editors/physics/particle_edit.c
===================================================================
--- trunk/blender/source/blender/editors/physics/particle_edit.c	2010-04-29 23:54:41 UTC (rev 28518)
+++ trunk/blender/source/blender/editors/physics/particle_edit.c	2010-04-30 01:22:21 UTC (rev 28519)
@@ -1380,11 +1380,14 @@
 
 static void select_root(PEData *data, int point_index)
 {
+	if (data->edit->points[point_index].flag & PEP_HIDE)
+		return;
+	
 	data->edit->points[point_index].keys->flag |= PEK_SELECT;
 	data->edit->points[point_index].flag |= PEP_EDIT_RECALC; /* redraw selection only */
 }
 
-static int select_first_exec(bContext *C, wmOperator *op)
+static int select_roots_exec(bContext *C, wmOperator *op)
 {
 	PEData data;
 
@@ -1397,14 +1400,14 @@
 	return OPERATOR_FINISHED;
 }
 
-void PARTICLE_OT_select_first(wmOperatorType *ot)
+void PARTICLE_OT_select_roots(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select First";
-	ot->idname= "PARTICLE_OT_select_first";
+	ot->name= "Select Roots";
+	ot->idname= "PARTICLE_OT_select_roots";
 	
 	/* api callbacks */
-	ot->exec= select_first_exec;
+	ot->exec= select_roots_exec;
 	ot->poll= PE_poll;
 
 	/* flags */
@@ -1416,11 +1419,15 @@
 static void select_tip(PEData *data, int point_index)
 {
 	PTCacheEditPoint *point = data->edit->points + point_index;
+	
+	if (point->flag & PEP_HIDE)
+		return;
+	
 	point->keys[point->totkey - 1].flag |= PEK_SELECT;
 	point->flag |= PEP_EDIT_RECALC; /* redraw selection only */
 }
 
-static int select_last_exec(bContext *C, wmOperator *op)
+static int select_tips_exec(bContext *C, wmOperator *op)
 {
 	PEData data;
 
@@ -1433,14 +1440,14 @@
 	return OPERATOR_FINISHED;
 }
 
-void PARTICLE_OT_select_last(wmOperatorType *ot)
+void PARTICLE_OT_select_tips(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Select Last";
-	ot->idname= "PARTICLE_OT_select_last";
+	ot->name= "Select Tips";
+	ot->idname= "PARTICLE_OT_select_tips";
 	
 	/* api callbacks */
-	ot->exec= select_last_exec;
+	ot->exec= select_tips_exec;
 	ot->poll= PE_poll;
 
 	/* flags */

Modified: trunk/blender/source/blender/editors/physics/physics_intern.h
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_intern.h	2010-04-29 23:54:41 UTC (rev 28518)
+++ trunk/blender/source/blender/editors/physics/physics_intern.h	2010-04-30 01:22:21 UTC (rev 28519)
@@ -37,8 +37,8 @@
 
 /* particle_edit.c */
 void PARTICLE_OT_select_all(struct wmOperatorType *ot);
-void PARTICLE_OT_select_first(struct wmOperatorType *ot);
-void PARTICLE_OT_select_last(struct wmOperatorType *ot);
+void PARTICLE_OT_select_roots(struct wmOperatorType *ot);
+void PARTICLE_OT_select_tips(struct wmOperatorType *ot);
 void PARTICLE_OT_select_linked(struct wmOperatorType *ot);
 void PARTICLE_OT_select_less(struct wmOperatorType *ot);
 void PARTICLE_OT_select_more(struct wmOperatorType *ot);

Modified: trunk/blender/source/blender/editors/physics/physics_ops.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_ops.c	2010-04-29 23:54:41 UTC (rev 28518)
+++ trunk/blender/source/blender/editors/physics/physics_ops.c	2010-04-30 01:22:21 UTC (rev 28519)
@@ -43,8 +43,8 @@
 static void operatortypes_particle(void)
 {
 	WM_operatortype_append(PARTICLE_OT_select_all);
-	WM_operatortype_append(PARTICLE_OT_select_first);
-	WM_operatortype_append(PARTICLE_OT_select_last);
+	WM_operatortype_append(PARTICLE_OT_select_roots);
+	WM_operatortype_append(PARTICLE_OT_select_tips);
 	WM_operatortype_append(PARTICLE_OT_select_linked);
 	WM_operatortype_append(PARTICLE_OT_select_less);
 	WM_operatortype_append(PARTICLE_OT_select_more);