[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18993] branches/blender2.5/blender/source /blender: 2.5
Ton Roosendaal
ton at blender.org
Mon Feb 16 15:28:36 CET 2009
Revision: 18993
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18993
Author: ton
Date: 2009-02-16 15:28:33 +0100 (Mon, 16 Feb 2009)
Log Message:
-----------
2.5
Cleanup of wm_event_types.h, removed all old "allqueue" defines.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_time/time_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/windowmanager/wm_event_types.h
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c 2009-02-16 12:14:04 UTC (rev 18992)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c 2009-02-16 14:28:33 UTC (rev 18993)
@@ -99,7 +99,6 @@
static int pupmenu() {return 0;}
static int qtest() {return 0;}
#define add_numbut(a, b, c, d, e, f, g) {}
-static int do_clever_numbuts() {return 0;}
static int snap_sel_to_curs() {return 0;}
static int snap_to_center() {return 0;}
@@ -4769,7 +4768,7 @@
/* -------------------- More tools ------------------ */
-
+#if 0
void mesh_set_face_flags(EditMesh *em, short mode)
{
EditFace *efa;
@@ -4837,6 +4836,7 @@
}
}
+#endif
void mesh_set_smooth_faces(EditMesh *em, short event)
{
Modified: branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c 2009-02-16 12:14:04 UTC (rev 18992)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c 2009-02-16 14:28:33 UTC (rev 18993)
@@ -139,7 +139,6 @@
#include "object_intern.h" // own include
/* ************* XXX **************** */
-static void allqueue() {}
static void error() {}
static void waitcursor() {}
static int pupmenu() {return 0;}
@@ -190,7 +189,6 @@
if(base) {
/* XXX old signals, remember to handle notifiers now! */
- // allqueue(REDRAWIPO, base->object->ipowin);
// select_actionchannel_by_name(base->object->action, "Object", 1);
/* disable temporal locks */
@@ -1320,10 +1318,6 @@
/* do operations */
add_hook(scene, v3d, mode);
-
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWBUTSOBJECT, 0);
-
}
/* ******************** clear parent operator ******************* */
@@ -2263,7 +2257,6 @@
}
}
}
- allqueue(REDRAWVIEW3D, 0);
DAG_scene_sort(scene);
}
@@ -2350,7 +2343,6 @@
DAG_scene_sort(scene);
DAG_object_flush_update(scene, newob, OB_RECALC);
- allqueue(REDRAWALL, 0);
}
}
@@ -3016,7 +3008,6 @@
cu->xof /= cu->fsize;
cu->yof /= cu->fsize;
- allqueue(REDRAWBUTSEDIT, 0);
tot_change++;
}
}
@@ -3050,7 +3041,6 @@
if (tot_change) {
ED_anim_dag_flush_update(C);
- allqueue(REDRAWVIEW3D, 0);
}
/* Warn if any errors occured */
@@ -3342,11 +3332,6 @@
DAG_scene_sort(scene);
- allqueue(REDRAWBUTSEDIT, 0);
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWOOPS, 0);
- allqueue(REDRAWINFO, 0);
-
}
@@ -3471,9 +3456,6 @@
la->clipend= origval;
}
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWBUTSSHADING, 0);
- BIF_preview_changed(ID_LA);
}
#endif
@@ -3538,8 +3520,6 @@
}
}
DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWBUTSEDIT, 0);
}
else if(G.f & G_VERTEXPAINT) {
Mesh *me= get_mesh(ob);
@@ -3661,7 +3641,6 @@
}
}
- allqueue(REDRAWVIEW3D, 0);
}
else if (ob->type == OB_FONT) {
/* removed until this gets a decent implementation (ton) */
@@ -3848,8 +3827,6 @@
}
}
- allqueue(REDRAWVIEW3D, 0);
-
}
static void curvetomesh(Scene *scene, Object *ob)
@@ -4083,10 +4060,6 @@
// XXX exit_editmode(C, EM_FREEDATA|EM_WAITCURSOR); /* freedata, but no undo */
BASACT= basact;
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWOOPS, 0);
-// allspace(OOPS_TEST, 0);
- allqueue(REDRAWBUTSEDIT, 0);
DAG_scene_sort(scene);
}
@@ -4225,10 +4198,6 @@
}
}
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWOOPS, 0);
- allqueue(REDRAWBUTSEDIT, 0);
- allqueue(REDRAWBUTSOBJECT, 0);
ED_anim_dag_flush_update(C);
}
@@ -4289,7 +4258,6 @@
}
}
MEM_freeN(str);
- allqueue(REDRAWVIEW3D, 0);
}
@@ -4424,8 +4392,6 @@
// if(errorstr) notice(errorstr);
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWBUTSOBJECT, 0);
DAG_scene_sort(scene);
}
@@ -4715,16 +4681,11 @@
}
}
- allqueue(REDRAWVIEW3D, 0);
if(do_scene_sort)
DAG_scene_sort(scene);
ED_anim_dag_flush_update(C);
- if(event==20) {
- allqueue(REDRAWBUTSOBJECT, 0);
- }
-
}
void copy_attr_menu(Scene *scene, View3D *v3d)
@@ -4923,10 +4884,6 @@
}
}
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWOOPS, 0);
- allqueue(REDRAWBUTSHEAD, 0);
-
ED_anim_dag_flush_update(C);
}
@@ -5155,7 +5112,6 @@
}
}
if (change) {
- allqueue(REDRAWVIEW3D, 0);
}
}
@@ -5194,7 +5150,6 @@
}
}
if (change) {
- allqueue(REDRAWVIEW3D, 0);
}
}
@@ -5618,7 +5573,6 @@
clear_id_newpoins();
- allqueue(REDRAWALL, 0);
}
}
@@ -5663,7 +5617,6 @@
if(mode==3) {
all_local(NULL, 0); /* NULL is all libs */
- allqueue(REDRAWALL, 0);
return;
}
else if(mode<1) return;
@@ -5789,7 +5742,6 @@
}
}
- allqueue(REDRAWALL, 0);
}
void make_local_menu(Scene *scene, View3D *v3d)
@@ -6148,7 +6100,6 @@
}
}
- allqueue(REDRAWVIEW3D, 0);
}
void set_ob_ipoflags(Scene *scene, View3D *v3d)
@@ -6183,12 +6134,6 @@
}
}
}
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWBUTSOBJECT, 0);
- allqueue(REDRAWNLA, 0);
- allqueue (REDRAWACTION, 0);
-// allspace(REMAKEIPO, 0);
- allqueue(REDRAWIPO, 0);
#endif // XXX old animation system
}
@@ -6231,11 +6176,6 @@
}
}
- allqueue(REDRAWNLA, 0);
- allqueue(REDRAWACTION, 0);
- allqueue(REDRAWVIEW3D, 0);
-// allspace(REMAKEIPO, 0);
- allqueue(REDRAWIPO, 0);
#endif // XXX old animation system
}
@@ -6296,8 +6236,6 @@
}
MEM_freeN(basesort);
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWBUTSOBJECT, 0);
}
void ofs_timeoffs(Scene *scene, View3D *v3d)
@@ -6318,8 +6256,6 @@
}
}
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWBUTSOBJECT, 0);
}
@@ -6342,8 +6278,6 @@
}
}
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWBUTSOBJECT, 0);
}
@@ -6468,8 +6402,5 @@
}
if (changed) {
-
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWBUTSEDIT, 0);
}
}
Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_node/node_header.c 2009-02-16 12:14:04 UTC (rev 18992)
+++ branches/blender2.5/blender/source/blender/editors/space_node/node_header.c 2009-02-16 14:28:33 UTC (rev 18993)
@@ -767,7 +767,7 @@
xco+= 100;
uiDefButBitI(block, TOG, R_COMP_FREE, B_NOP, "Free Unused", xco+5,yco,100,19, &scene->r.scemode, 0.0f, 0.0f, 0, 0, "Free Nodes that are not used while composite");
xco+= 100;
- uiDefButBitS(block, TOG, SNODE_BACKDRAW, REDRAWNODE, "Backdrop", xco+5,yco,90,19, &snode->flag, 0.0f, 0.0f, 0, 0, "Use active Viewer Node output as backdrop");
+ uiDefButBitS(block, TOG, SNODE_BACKDRAW, B_REDR, "Backdrop", xco+5,yco,90,19, &snode->flag, 0.0f, 0.0f, 0, 0, "Use active Viewer Node output as backdrop");
xco+= 90;
}
else if(snode->treetype==NTREE_TEXTURE) {
Modified: branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c 2009-02-16 12:14:04 UTC (rev 18992)
+++ branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c 2009-02-16 14:28:33 UTC (rev 18993)
@@ -132,7 +132,6 @@
/* ************* XXX **************** */
-static void allqueue() {}
static void BIF_undo_push() {}
static void BIF_preview_changed() {}
static void error() {}
@@ -1465,9 +1464,6 @@
BIF_undo_push("Outliner toggle selectability");
- allqueue(REDRAWVIEW3D, 1);
- allqueue(REDRAWOOPS, 0);
- allqueue(REDRAWINFO, 1);
}
static void object_toggle_selectability_cb(TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *tselem)
@@ -1488,9 +1484,6 @@
BIF_undo_push("Outliner toggle selectability");
- allqueue(REDRAWVIEW3D, 1);
- allqueue(REDRAWOOPS, 0);
- allqueue(REDRAWINFO, 1);
}
void object_toggle_renderability_cb(TreeElement *te, TreeStoreElem *tsep, TreeStoreElem *tselem)
@@ -1511,9 +1504,6 @@
BIF_undo_push("Outliner toggle renderability");
- allqueue(REDRAWVIEW3D, 1);
- allqueue(REDRAWOOPS, 0);
- allqueue(REDRAWINFO, 1);
}
void outliner_toggle_visible(SpaceOops *soops)
@@ -1641,7 +1631,6 @@
if(set) {
sce->r.actlay= tselem->nr;
- allqueue(REDRAWBUTSSCENE, 0);
}
else {
return sce->r.actlay==tselem->nr;
@@ -1733,10 +1722,6 @@
if(set) {
// XXX extern_set_butspace(F5KEY, 0); // force shading buttons
BIF_preview_changed(ID_MA);
- allqueue(REDRAWBUTSSHADING, 1);
- allqueue(REDRAWNODE, 0);
- allqueue(REDRAWOOPS, 0);
- allqueue(REDRAWIPO, 0);
}
return 0;
}
@@ -1823,9 +1808,6 @@
if(set) {
// XXX extern_set_butspace(F5KEY, 0);
BIF_preview_changed(ID_LA);
- allqueue(REDRAWBUTSSHADING, 1);
- allqueue(REDRAWOOPS, 0);
- allqueue(REDRAWIPO, 0);
}
else return 1;
@@ -1870,7 +1852,6 @@
if(set) {
ob->actdef= te->index+1;
DAG_object_flush_update(scene, ob, OB_RECALC_DATA);
- allqueue(REDRAWVIEW3D, ob->ipowin);
}
else {
if(ob==OBACT)
@@ -1886,7 +1867,6 @@
if(set) {
if (ob->pose) {
ob->pose->active_group= te->index+1;
- allqueue(REDRAWBUTSEDIT, 0);
}
}
else {
@@ -1909,9 +1889,6 @@
// else deselectall_posearmature(ob, 0, 0); // 0 = deselect
pchan->bone->flag |= BONE_SELECTED|BONE_ACTIVE;
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWOOPS, 0);
- allqueue(REDRAWACTION, 0);
}
}
else {
@@ -1933,9 +1910,6 @@
// else deselectall_posearmature(OBACT, 0, 0);
bone->flag |= BONE_SELECTED|BONE_ACTIVE;
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWOOPS, 0);
- allqueue(REDRAWACTION, 0);
}
}
else {
@@ -1965,9 +1939,6 @@
// flush to parent?
if(ebone->parent && (ebone->flag & BONE_CONNECTED)) ebone->parent->flag |= BONE_TIPSEL;
- allqueue(REDRAWVIEW3D, 0);
- allqueue(REDRAWOOPS, 0);
- allqueue(REDRAWACTION, 0);
}
}
else {
@@ -2053,7 +2024,6 @@
if(set) {
// XXX select_single_seq(seq, 1);
- allqueue(REDRAWSEQ, 0);
}
else {
if(seq->flag & SELECT)
@@ -2086,7 +2056,6 @@
// XXX select_single_seq(p, 0);
p= p->next;
}
- allqueue(REDRAWSEQ, 0);
return(0);
}
@@ -2917,7 +2886,6 @@
// Sequence *seq= (Sequence*) te->directdata;
if(event==1) {
// XXX select_single_seq(seq, 1);
- allqueue(REDRAWSEQ, 0);
}
}
@@ -2950,7 +2918,6 @@
// DAG_scene_sort(scene);
// BIF_undo_push("Delete Objects");
// }
-// allqueue(REDRAWALL, 0);
}
@@ -3005,7 +2972,6 @@
}
BIF_undo_push(str);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list