Revision: 19062 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19062 Author: blendix Date: 2009-02-20 21:39:27 +0100 (Fri, 20 Feb 2009)
Log Message: ----------- 2.5: Particle Edit, work in progress commit. * Still incomplete and some operators don't work, refresh issues, etc. * Made Hide/Reveal operators consistent for various modes. Modified Paths: -------------- branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c branches/blender2.5/blender/source/blender/editors/armature/editarmature.c branches/blender2.5/blender/source/blender/editors/armature/poseobject.c branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c branches/blender2.5/blender/source/blender/editors/curve/editcurve.c branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c branches/blender2.5/blender/source/blender/editors/object/object_edit.c branches/blender2.5/blender/source/blender/editors/physics/editparticle.c branches/blender2.5/blender/source/blender/editors/sculpt_paint/sculpt.c branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c branches/blender2.5/blender/source/blender/editors/space_image/image_header.c branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c branches/blender2.5/blender/source/blender/editors/util/undo.c branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c branches/blender2.5/blender/source/blender/windowmanager/WM_types.h Added Paths: ----------- branches/blender2.5/blender/source/blender/editors/include/ED_particle.h Removed Paths: ------------- branches/blender2.5/blender/source/blender/editors/include/ED_editparticle.h Modified: branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c 2009-02-20 19:11:35 UTC (rev 19061) +++ branches/blender2.5/blender/source/blender/editors/armature/armature_ops.c 2009-02-20 20:39:27 UTC (rev 19062) @@ -192,7 +192,7 @@ WM_keymap_add_item(keymap, "POSE_OT_hide", HKEY, KM_PRESS, 0, 0); kmi= WM_keymap_add_item(keymap, "POSE_OT_hide", HKEY, KM_PRESS, KM_SHIFT, 0); - RNA_boolean_set(kmi->ptr, "invert", 1); + RNA_boolean_set(kmi->ptr, "unselected", 1); WM_keymap_add_item(keymap, "POSE_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0); /*clear pose*/ WM_keymap_add_item(keymap, "POSE_OT_rot_clear", RKEY, KM_PRESS, KM_ALT, 0); Modified: branches/blender2.5/blender/source/blender/editors/armature/editarmature.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-02-20 19:11:35 UTC (rev 19061) +++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-02-20 20:39:27 UTC (rev 19062) @@ -4703,7 +4703,7 @@ Object *ob= CTX_data_active_object(C); bArmature *arm= ob->data; - if(RNA_boolean_get(op->ptr, "invert")) + if(RNA_boolean_get(op->ptr, "unselected")) bone_looper(ob, arm->bonebase.first, NULL, hide_unselected_pose_bone); else @@ -4719,7 +4719,7 @@ void POSE_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide Selection"; + ot->name= "Hide Selected"; ot->idname= "POSE_OT_hide"; /* api callbacks */ @@ -4730,7 +4730,7 @@ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", ""); } static int show_pose_bone(Object *ob, Bone *bone, void *ptr) @@ -4764,7 +4764,7 @@ void POSE_OT_reveal(wmOperatorType *ot) { /* identifiers */ - ot->name= "Reveil Selection"; + ot->name= "Reveal Selected"; ot->idname= "POSE_OT_reveal"; /* api callbacks */ @@ -4773,9 +4773,6 @@ /* flags */ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; - - /* props */ - RNA_def_boolean(ot->srna, "invert", 0, "Invert", ""); } /* ************* RENAMING DISASTERS ************ */ Modified: branches/blender2.5/blender/source/blender/editors/armature/poseobject.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/armature/poseobject.c 2009-02-20 19:11:35 UTC (rev 19061) +++ branches/blender2.5/blender/source/blender/editors/armature/poseobject.c 2009-02-20 20:39:27 UTC (rev 19062) @@ -128,7 +128,7 @@ ob->flag |= OB_POSEMODE; base->flag= ob->flag; - WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_POSEMODE, NULL); + WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_MODE_POSE, NULL); break; default: Modified: branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c 2009-02-20 19:11:35 UTC (rev 19061) +++ branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c 2009-02-20 20:39:27 UTC (rev 19062) @@ -237,7 +237,7 @@ WM_keymap_add_item(keymap, "CURVE_OT_reveal", HKEY, KM_PRESS, KM_ALT, 0); WM_keymap_add_item(keymap, "CURVE_OT_hide", HKEY, KM_PRESS, KM_ALT|KM_CTRL, 0); - RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_hide", HKEY, KM_PRESS, KM_ALT|KM_SHIFT, 0)->ptr, "deselected", 1); + RNA_enum_set(WM_keymap_add_item(keymap, "CURVE_OT_hide", HKEY, KM_PRESS, KM_ALT|KM_SHIFT, 0)->ptr, "unselected", 1); WM_keymap_add_item(keymap, "CURVE_OT_specials_menu", WKEY, KM_PRESS, 0, 0); } Modified: branches/blender2.5/blender/source/blender/editors/curve/editcurve.c =================================================================== --- branches/blender2.5/blender/source/blender/editors/curve/editcurve.c 2009-02-20 19:11:35 UTC (rev 19061) +++ branches/blender2.5/blender/source/blender/editors/curve/editcurve.c 2009-02-20 20:39:27 UTC (rev 19062) @@ -1618,7 +1618,7 @@ Nurb *nu; BPoint *bp; BezTriple *bezt; - int a, sel, invert= RNA_boolean_get(op->ptr, "deselected"); + int a, sel, invert= RNA_boolean_get(op->ptr, "unselected"); for(nu= editnurb->first; nu; nu= nu->next) { if((nu->type & 7)==CU_BEZIER) { @@ -1668,7 +1668,7 @@ void CURVE_OT_hide(wmOperatorType *ot) { /* identifiers */ - ot->name= "Hide Selection"; + ot->name= "Hide Selected"; ot->idname= "CURVE_OT_hide"; /* api callbacks */ @@ -1679,7 +1679,7 @@ ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO; /* props */ - RNA_def_boolean(ot->srna, "deselected", 0, "Deselected", "Hide deselected rather than selected."); + RNA_def_boolean(ot->srna, "unselected", 0, "Unselected", "Hide unselected rather than selected."); } /********************** reveal operator *********************/ Deleted: branches/blender2.5/blender/source/blender/editors/include/ED_editparticle.h =================================================================== --- branches/blender2.5/blender/source/blender/editors/include/ED_editparticle.h 2009-02-20 19:11:35 UTC (rev 19061) +++ branches/blender2.5/blender/source/blender/editors/include/ED_editparticle.h 2009-02-20 20:39:27 UTC (rev 19062) @@ -1,96 +0,0 @@ -/* - * $Id: ED_editparticle.h $ - * - * ***** BEGIN GPL LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2007 by Janne Karhu. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef ED_EDITPARTICLE_H -#define ED_EDITPARTICLE_H - -struct Object; -struct ParticleSystem; -struct ParticleEditSettings; -struct RadialControl; -struct ViewContext; -struct rcti; - -/* particle edit mode */ -void PE_set_particle_edit(struct Scene *scene); -void PE_create_particle_edit(struct Object *ob, struct ParticleSystem *psys); -void PE_free_particle_edit(struct ParticleSystem *psys); - -void PE_change_act(void *ob_v, void *act_v); -void PE_change_act_psys(struct Object *ob, struct ParticleSystem *psys); -int PE_can_edit(struct ParticleSystem *psys); - -/* access */ -struct ParticleSystem *PE_get_current(struct Object *ob); -short PE_get_current_num(struct Object *ob); -int PE_minmax(struct Scene *scene, float *min, float *max); -void PE_get_colors(char sel[4], char nosel[4]); -struct ParticleEditSettings *PE_settings(Scene *scene); -struct RadialControl **PE_radialcontrol(void); - -/* update calls */ -void PE_hide_keys_time(struct Scene *scene, struct ParticleSystem *psys, float cfra); -void PE_update_object(struct Scene *scene, struct Object *ob, int useflag); -void PE_update_selection(struct Scene *scene, struct Object *ob, int useflag); -void PE_recalc_world_cos(struct Object *ob, struct ParticleSystem *psys); - -/* selection tools */ -void PE_select_root(void); -void PE_select_tip(void); -void PE_deselectall(void); -void PE_select_linked(void); -void PE_select_less(void); -void PE_select_more(void); - -void PE_mouse_particles(void); -void PE_borderselect(struct ViewContext *vc, struct rcti *rect, int select); -void PE_selectionCB(short selecting, struct Object *editobj, short *mval, float rad); -void PE_do_lasso_select(struct ViewContext *, short mcords[][2], short moves, short select); - -/* tools */ -void PE_hide(int mode); -void PE_rekey(void); -void PE_subdivide(Object *ob); -int PE_brush_particles(void); -void PE_delete_particle(void); -void PE_remove_doubles(void); -void PE_mirror_x(Scene *scene, int tagged); -void PE_selectbrush_menu(Scene *scene); -void PE_remove_doubles(void); -void PE_radialcontrol_start(const int mode); - -/* undo */ -void PE_undo_push(Scene *scene, char *str); -void PE_undo_step(Scene *scene, int step); -void PE_undo(Scene *scene); -void PE_redo(Scene *scene); -void PE_undo_menu(Scene *scene); - -#endif /* ED_EDITPARTICLE_H */ - Copied: branches/blender2.5/blender/source/blender/editors/include/ED_particle.h (from rev 19055, branches/blender2.5/blender/source/blender/editors/include/ED_editparticle.h) =================================================================== --- branches/blender2.5/blender/source/blender/editors/include/ED_particle.h (rev 0) +++ branches/blender2.5/blender/source/blender/editors/include/ED_particle.h 2009-02-20 20:39:27 UTC (rev 19062) @@ -0,0 +1,99 @@ +/* + * $Id: ED_editparticle.h $ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2007 by Janne Karhu. + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#ifndef ED_PARTICLE_H +#define ED_PARTICLE_H + +struct Object; +struct ParticleSystem; +struct ParticleEditSettings; +struct RadialControl; +struct ViewContext; +struct rcti; +struct wmWindowManager; + @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs