[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13051] branches/blender2.5/blender/source /blender: Badlevel call amount reduced to 21!
Ton Roosendaal
ton at blender.org
Sat Dec 29 19:44:31 CET 2007
Revision: 13051
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13051
Author: ton
Date: 2007-12-29 19:44:31 +0100 (Sat, 29 Dec 2007)
Log Message:
-----------
Badlevel call amount reduced to 21!
(worst was radio module)
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
branches/blender2.5/blender/source/blender/blenkernel/intern/verse_method.c
branches/blender2.5/blender/source/blender/editors/screen/stubs.c
branches/blender2.5/blender/source/blender/radiosity/intern/source/raddisplay.c
branches/blender2.5/blender/source/blender/radiosity/intern/source/radfactors.c
branches/blender2.5/blender/source/blender/radiosity/intern/source/radio.c
branches/blender2.5/blender/source/blender/radiosity/intern/source/radnode.c
branches/blender2.5/blender/source/blender/radiosity/intern/source/radpostprocess.c
branches/blender2.5/blender/source/blender/radiosity/intern/source/radpreprocess.c
branches/blender2.5/blender/source/blender/radiosity/intern/source/radrender.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c 2007-12-29 18:35:24 UTC (rev 13050)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c 2007-12-29 18:44:31 UTC (rev 13051)
@@ -102,8 +102,6 @@
#include "RE_shader_ext.h"
#include "BIF_meshlaplacian.h"
-#include "BIF_space.h"
-#include "mydevice.h"
/***/
@@ -6901,7 +6899,7 @@
}
}
- if (qRedraw) allqueue(REDRAWBUTSEDIT, 0);
+// XXX if (qRedraw) allqueue(REDRAWBUTSEDIT, 0);
}
void modifiers_foreachObjectLink(Object *ob, ObjectWalkFunc walk,
@@ -6967,7 +6965,7 @@
md->error = BLI_strdup(buffer);
- allqueue(REDRAWBUTSEDIT, 0);
+// XXX allqueue(REDRAWBUTSEDIT, 0);
}
/* used for buttons, to find out if the 'draw deformed in editmode' option is
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c 2007-12-29 18:35:24 UTC (rev 13050)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c 2007-12-29 18:44:31 UTC (rev 13051)
@@ -60,7 +60,6 @@
#include "BLI_threads.h"
#include "BKE_anim.h"
-#include "BKE_bad_level_calls.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_displist.h"
@@ -78,10 +77,7 @@
#include "BKE_mesh.h"
#include "BKE_modifier.h"
-#include "BSE_headerbuttons.h"
-#include "blendef.h"
-
#include "RE_shader_ext.h"
/************************************************/
@@ -826,7 +822,7 @@
return 0;
if (!finaldm->deformedOnly && !CustomData_has_layer( &finaldm->faceData, CD_ORIGINDEX ) ) {
- error("Can't paint with the current modifier stack, disable destructive modifiers");
+// XXX error("Can't paint with the current modifier stack, disable destructive modifiers");
return 0;
}
@@ -1393,9 +1389,9 @@
pa->lifetime= part->lifetime*ptex.life;
if(part->type==PART_HAIR)
- pa->time=0.0f;
+ pa->time= 0.0f;
else if(part->type==PART_REACTOR && (part->flag&PART_REACT_STA_END)==0)
- pa->time=MAXFRAMEF;
+ pa->time= 300000.0f; /* max frame */
else{
//icu=find_ipocurve(psys->part->ipo,PART_EMIT_TIME);
//if(icu){
@@ -4418,7 +4414,7 @@
/* this is a bad level call, but currently type change
* can happen after redraw, so force redraw from here */
-// allqueue(REDRAWBUTSOBJECT, 0);
+// XXX allqueue(REDRAWBUTSOBJECT, 0);
}
else
oldtotpart = psys->totpart;
@@ -4432,7 +4428,8 @@
if(oldtotpart != totpart || psys->recalc&PSYS_ALLOC || (psys->part->childtype && psys->totchild != psys->totpart*child_nbr))
alloc = 1;
- if(alloc || psys->recalc&PSYS_DISTR || (psys->vgroup[PSYS_VG_DENSITY] && (G.f & G_WEIGHTPAINT) && ob==OBACT))
+ /* bad context? XXX */
+ if(alloc || psys->recalc&PSYS_DISTR || (psys->vgroup[PSYS_VG_DENSITY] && (G.f & G_WEIGHTPAINT) && ob==(G.scene->basact?G.scene->basact->object:NULL)))
distr = 1;
if(distr || psys->recalc&PSYS_INIT)
@@ -4556,7 +4553,7 @@
if(!psys_check_enabled(ob, psys))
return;
- cfra=bsystem_time(ob,(float)CFRA,0.0);
+ cfra=bsystem_time(ob,(float)G.scene->r.cfra,0.0);
psmd= psys_get_modifier(ob, psys);
/* system was already updated from modifier stack */
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/verse_method.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/verse_method.c 2007-12-29 18:35:24 UTC (rev 13050)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/verse_method.c 2007-12-29 18:44:31 UTC (rev 13051)
@@ -496,7 +496,7 @@
if(text) {
txt_insert_buf(text, showstr);
txt_move_eof(text, 0);
- allqueue(REDRAWCHAT, 0);
+// XXX allqueue(REDRAWCHAT, 0);
} else {
printf("%s> %s: %s\n",arg[0].vstring, arg[1].vstring, arg[2].vstring);
}
Modified: branches/blender2.5/blender/source/blender/editors/screen/stubs.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/stubs.c 2007-12-29 18:35:24 UTC (rev 13050)
+++ branches/blender2.5/blender/source/blender/editors/screen/stubs.c 2007-12-29 18:44:31 UTC (rev 13051)
@@ -31,18 +31,9 @@
/* various UI stuff */
void blender_test_break() {}
void error() {}
-void notice() {}
void set_timecursor() {}
-void screen_swapbuffers() {}
-void waitcursor() {}
-void get_qual() {}
-void mainqenter() {}
-void saveover() {}
-void texstr() {}
-void pupmenu() {}
/* global vars */
-void *curarea;
void *editNurb;
void *editelems;
@@ -63,12 +54,7 @@
void BPY_pyconstraint_target() {}
/* areas */
-void allqueue() {}
-void scrarea_do_windraw() {}
-void areawinset() {}
-void mywinget() {}
void copy_view3d_lock() {}
-void persp() {}
/* seq */
void do_render_seq() {}
@@ -76,10 +62,6 @@
void get_forground_frame_seq() {}
void build_seqar() {}
-/* tools */
-void delete_obj() {}
-void deselectall() {}
-
/* sculpt */
void sculptmode_free_all() {}
void sculptmode_init() {}
@@ -101,7 +83,6 @@
void BIF_filelist_freelib() {}
/* audio */
-
void audiostream_play() {}
void audiostream_fill() {}
Modified: branches/blender2.5/blender/source/blender/radiosity/intern/source/raddisplay.c
===================================================================
--- branches/blender2.5/blender/source/blender/radiosity/intern/source/raddisplay.c 2007-12-29 18:35:24 UTC (rev 13050)
+++ branches/blender2.5/blender/source/blender/radiosity/intern/source/raddisplay.c 2007-12-29 18:44:31 UTC (rev 13051)
@@ -57,12 +57,7 @@
#include "BKE_main.h"
#include "BIF_gl.h"
-#include "BIF_screen.h"
-#include "BIF_space.h"
-#include "BIF_mywindow.h"
-#include "BSE_view.h"
-
#include "radio.h"
/* cpack has to be endian-insensitive! (old irisgl function) */
@@ -208,7 +203,7 @@
cpack(col);
- oldsa= curarea;
+ oldsa= NULL; // XXX curarea;
sa= G.curscreen->areabase.first;
while(sa) {
@@ -216,8 +211,8 @@
v3d= sa->spacedata.first;
/* use mywinget() here: otherwise it draws in header */
- if(sa->win != mywinget()) areawinset(sa->win);
- persp(PERSP_VIEW);
+// XXX if(sa->win != mywinget()) areawinset(sa->win);
+// XXX persp(PERSP_VIEW);
if(v3d->zbuf) glDisable(GL_DEPTH_TEST);
drawnodeWire(patch->first);
if(v3d->zbuf) glEnable(GL_DEPTH_TEST); // pretty useless?
@@ -225,7 +220,7 @@
sa= sa->next;
}
- if(oldsa && oldsa!=curarea) areawinset(oldsa->win);
+// XXX if(oldsa && oldsa!=curarea) areawinset(oldsa->win);
glFlush();
glDrawBuffer(GL_BACK);
@@ -416,22 +411,12 @@
}
}
else {
- if(!(get_qual()&LR_SHIFTKEY)) {
-
- for(a=0; a<RG.totface; a++) {
- RAD_NEXTFACE(a);
-
- drawfaceWire(face);
- }
+ cpack(0);
+ rp= RG.patchbase.first;
+ while(rp) {
+ drawsingnodeWire(rp->first);
+ rp= rp->next;
}
- else {
- cpack(0);
- rp= RG.patchbase.first;
- while(rp) {
- drawsingnodeWire(rp->first);
- rp= rp->next;
- }
- }
}
}
else {
@@ -472,19 +457,19 @@
{
ScrArea *sa, *oldsa;
- oldsa= curarea;
+ oldsa= NULL; // XXX curarea;
sa= G.curscreen->areabase.first;
while(sa) {
if (sa->spacetype==SPACE_VIEW3D) {
/* use mywinget() here: othwerwise it draws in header */
- if(sa->win != mywinget()) areawinset(sa->win);
- scrarea_do_windraw(sa);
+// XXX if(sa->win != mywinget()) areawinset(sa->win);
+// XXX scrarea_do_windraw(sa);
}
sa= sa->next;
}
- screen_swapbuffers();
+// XXX screen_swapbuffers();
- if(oldsa && oldsa!=curarea) areawinset(oldsa->win);
+// XXX if(oldsa && oldsa!=curarea) areawinset(oldsa->win);
}
Modified: branches/blender2.5/blender/source/blender/radiosity/intern/source/radfactors.c
===================================================================
--- branches/blender2.5/blender/source/blender/radiosity/intern/source/radfactors.c 2007-12-29 18:35:24 UTC (rev 13050)
+++ branches/blender2.5/blender/source/blender/radiosity/intern/source/radfactors.c 2007-12-29 18:44:31 UTC (rev 13051)
@@ -50,8 +50,6 @@
#include "BKE_global.h"
#include "BKE_main.h"
-#include "BIF_screen.h"
-
#include "radio.h"
#include "RE_render_ext.h" /* for `RE_zbufferall_radio and RE_zbufferall_radio */
Modified: branches/blender2.5/blender/source/blender/radiosity/intern/source/radio.c
===================================================================
--- branches/blender2.5/blender/source/blender/radiosity/intern/source/radio.c 2007-12-29 18:35:24 UTC (rev 13050)
+++ branches/blender2.5/blender/source/blender/radiosity/intern/source/radio.c 2007-12-29 18:44:31 UTC (rev 13051)
@@ -91,11 +91,7 @@
#include "BKE_global.h"
#include "BKE_main.h"
-#include "BIF_screen.h" /* curarea */
-#include "BIF_space.h" /* allqueue */
-
#include "radio.h"
-#include "mydevice.h"
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -191,10 +187,10 @@
void rad_printstatus()
{
/* actions always are started from a buttonswindow */
- if(curarea) {
- scrarea_do_windraw(curarea);
- screen_swapbuffers();
- }
+// XX if(curarea) {
+// scrarea_do_windraw(curarea);
+// screen_swapbuffers();
+// }
}
void rad_setlimits()
@@ -357,7 +353,7 @@
removeEqualNodes(RG.nodelim);
closehemiwindows();
- allqueue(REDRAWVIEW3D, 1);
+// XXX allqueue(REDRAWVIEW3D, 1);
}
void rad_subdivshootelem(void)
@@ -376,7 +372,7 @@
removeEqualNodes(RG.nodelim);
closehemiwindows();
- allqueue(REDRAWVIEW3D, 1);
+// XXX allqueue(REDRAWVIEW3D, 1);
}
void rad_limit_subdivide()
Modified: branches/blender2.5/blender/source/blender/radiosity/intern/source/radnode.c
===================================================================
--- branches/blender2.5/blender/source/blender/radiosity/intern/source/radnode.c 2007-12-29 18:35:24 UTC (rev 13050)
+++ branches/blender2.5/blender/source/blender/radiosity/intern/source/radnode.c 2007-12-29 18:44:31 UTC (rev 13051)
@@ -49,8 +49,6 @@
#include "BKE_global.h"
#include "BKE_main.h"
-#include "BIF_toolbox.h"
-
#include "radio.h"
#ifdef HAVE_CONFIG_H
@@ -221,7 +219,7 @@
void start_fastmalloc(char *str)
{
if(fastmallocstr) {
- error("Fastmalloc in use: %s", fastmallocstr);
+// XXX error("Fastmalloc in use: %s", fastmallocstr);
return;
}
fastmallocstr= str;
Modified: branches/blender2.5/blender/source/blender/radiosity/intern/source/radpostprocess.c
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list