Revision: 18005
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18005
Author: ton
Date: 2008-12-22 10:43:29 +0100 (Mon, 22 Dec 2008)
Log Message:
-----------
2.5
Cleanup
- for portablity we can keep the old ugly defines for retrieving
active object, cfra and so on. But, they will use 'scene' not
G.scene.
- fixed code that uses those defines.
- some unused variables/functions removed
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
branches/blender2.5/blender/source/blender/editors/animation/anim_draw.c
branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
branches/blender2.5/blender/source/blender/editors/interface/view2d.c
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
branches/blender2.5/blender/source/blender/editors/space_time/space_time.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawarmature.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawmesh.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.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/makesdna/DNA_scene_types.h
branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
branches/blender2.5/blender/source/blender/render/extern/include/RE_render_ext.h
branches/blender2.5/blender/source/blender/render/intern/source/convertblender.c
branches/blender2.5/blender/source/blender/render/intern/source/rayshade.c
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
---
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
2008-12-22 09:10:02 UTC (rev 18004)
+++
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
2008-12-22 09:43:29 UTC (rev 18005)
@@ -4429,7 +4429,7 @@
part= psys->part;
cache= psys->pointcache;
- framenr= (int)CFRA;
+ framenr= (int)G.scene->r.cfra;
framedelta= framenr - cache->simframe;
BKE_ptcache_id_from_particles(&pid, ob, psys);
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_draw.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_draw.c
2008-12-22 09:10:02 UTC (rev 18004)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_draw.c
2008-12-22 09:43:29 UTC (rev 18005)
@@ -71,7 +71,7 @@
/* CURRENT FRAME DRAWING */
/* Draw current frame number in a little green box beside the current frame
indicator */
-static void draw_cfra_number (View2D *v2d, float cfra, short time)
+static void draw_cfra_number (Scene *scene, View2D *v2d, float cfra, short
time)
{
float xscale, yscale, x, y;
char str[32];
@@ -147,7 +147,7 @@
/* Draw current frame number in a little box */
if (flag & DRAWCFRA_SHOW_NUMBOX) {
UI_view2d_view_orthoSpecial(C, v2d, 1);
- draw_cfra_number(v2d, vec[0], (flag & DRAWCFRA_UNIT_SECONDS));
+ draw_cfra_number(scene, v2d, vec[0], (flag &
DRAWCFRA_UNIT_SECONDS));
}
}
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
2008-12-22 09:10:02 UTC (rev 18004)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
2008-12-22 09:43:29 UTC (rev 18005)
@@ -362,6 +362,7 @@
static int ed_marker_move_modal(bContext *C, wmOperator *op, wmEvent *evt)
{
+ Scene *scene= CTX_data_scene(C);
MarkerMove *mm= op->customdata;
View2D *v2d= UI_view2d_fromcontext(C);
TimeMarker *marker, *selmarker=NULL;
Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d.c
2008-12-22 09:10:02 UTC (rev 18004)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c
2008-12-22 09:43:29 UTC (rev 18005)
@@ -867,6 +867,7 @@
*/
View2DGrid *UI_view2d_grid_calc(const bContext *C, View2D *v2d, short xunits,
short xclamp, short yunits, short yclamp, int winx, int winy)
{
+ Scene *scene= CTX_data_scene(C);
View2DGrid *grid;
float space, pixels, seconddiv;
int secondgrid;
@@ -1137,7 +1138,7 @@
}
/* Print scale marking along a time scrollbar */
-static void scroll_printstr(View2DScrollers *scrollers, float x, float y,
float val, int power, short unit, char dir)
+static void scroll_printstr(View2DScrollers *scrollers, Scene *scene, float x,
float y, float val, int power, short unit, char dir)
{
int len;
char str[32];
@@ -1250,6 +1251,7 @@
/* Draw scrollbars in the given 2d-region */
void UI_view2d_scrollers_draw(const bContext *C, View2D *v2d, View2DScrollers
*vs)
{
+ Scene *scene= CTX_data_scene(C);
const short darker= -50, dark= -10, light= 20, lighter= 50;
rcti vert, hor, corner;
@@ -1355,12 +1357,12 @@
for (; fac < hor.xmax; fac+=dfac,
val+=grid->dx) {
switch (vs->xunits) {
case V2D_UNIT_FRAMES:
/* frames (as whole numbers)*/
- scroll_printstr(vs,
fac, 3.0+(float)(hor.ymin), val, grid->powerx, V2D_UNIT_FRAMES, 'h');
+ scroll_printstr(vs,
scene, fac, 3.0+(float)(hor.ymin), val, grid->powerx, V2D_UNIT_FRAMES, 'h');
break;
case V2D_UNIT_SECONDS:
/* seconds */
fac2= val/FPS;
- scroll_printstr(vs,
fac, 3.0+(float)(hor.ymin), fac2, grid->powerx, V2D_UNIT_SECONDS, 'h');
+ scroll_printstr(vs,
scene, fac, 3.0+(float)(hor.ymin), fac2, grid->powerx, V2D_UNIT_SECONDS, 'h');
break;
case V2D_UNIT_SECONDSSEQ:
/* seconds with special calculations (only used for sequencer only) */
@@ -1371,13 +1373,13 @@
time= floor(fac2);
fac2= fac2-time;
- scroll_printstr(vs,
fac, 3.0+(float)(hor.ymin), time+FPS*fac2/100.0, grid->powerx,
V2D_UNIT_SECONDSSEQ, 'h');
+ scroll_printstr(vs,
scene, fac, 3.0+(float)(hor.ymin), time+FPS*fac2/100.0, grid->powerx,
V2D_UNIT_SECONDSSEQ, 'h');
}
break;
case V2D_UNIT_DEGREES:
/* IPO-Editor for rotation IPO-Drivers */
/* HACK: although we're
drawing horizontal, we make this draw as 'vertical', just to get degree signs */
- scroll_printstr(vs,
fac, 3.0+(float)(hor.ymin), val, grid->powerx, V2D_UNIT_DEGREES, 'v');
+ scroll_printstr(vs,
scene, fac, 3.0+(float)(hor.ymin), val, grid->powerx, V2D_UNIT_DEGREES, 'v');
break;
}
}
@@ -1484,7 +1486,7 @@
/* draw vertical steps */
for (; fac < vert.ymax; fac+= dfac, val += grid->dy) {
- scroll_printstr(vs, (float)(vert.xmax)-14.0,
fac, val, grid->powery, vs->yunits, 'v');
+ scroll_printstr(vs, scene,
(float)(vert.xmax)-14.0, fac, val, grid->powery, vs->yunits, 'v');
}
}
Modified:
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
2008-12-22 09:10:02 UTC (rev 18004)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
2008-12-22 09:43:29 UTC (rev 18005)
@@ -1267,11 +1267,11 @@
void ED_animation_timer(wmWindow *win, int enable)
{
- if(win->animtimer)
- WM_event_remove_window_timer(win, win->animtimer);
- win->animtimer= NULL;
+// if(win->animtimer)
+// WM_event_remove_window_timer(win, win->animtimer);
+// win->animtimer= NULL;
- if(enable)
- win->animtimer= WM_event_add_window_timer(win, (int)(1000/FPS),
(int)(1000/FPS));
+// if(enable)
+// win->animtimer= WM_event_add_window_timer(win, (int)(1000/FPS),
(int)(1000/FPS));
}
Modified:
branches/blender2.5/blender/source/blender/editors/space_time/space_time.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_time/space_time.c
2008-12-22 09:10:02 UTC (rev 18004)
+++ branches/blender2.5/blender/source/blender/editors/space_time/space_time.c
2008-12-22 09:43:29 UTC (rev 18005)
@@ -86,7 +86,7 @@
static void time_draw_sfra_efra(const bContext *C, SpaceTime *stime, ARegion
*ar)
{
View2D *v2d= UI_view2d_fromcontext(C);
- //Scene *scene= CTX_data_scene(C);
+ Scene *scene= CTX_data_scene(C);
/* draw darkened area outside of active timeline
* frame range used is preview range or scene range */
@@ -229,9 +229,10 @@
BLI_addtail(&stime->regionbase, ar);
ar->regiontype= RGN_TYPE_WINDOW;
- ar->v2d.tot.xmin= (float)(SFRA - 4);
+ /* XXX here sfra and efra was used.... */
+ ar->v2d.tot.xmin= (float)(- 4);
ar->v2d.tot.ymin= 0.0f;
- ar->v2d.tot.xmax= (float)(EFRA + 4);
+ ar->v2d.tot.xmax= (float)(250 + 4);
ar->v2d.tot.ymax= 50.0f;
ar->v2d.cur= ar->v2d.tot;
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/drawarmature.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/drawarmature.c
2008-12-22 09:10:02 UTC (rev 18004)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/drawarmature.c
2008-12-22 09:43:29 UTC (rev 18005)
@@ -2022,7 +2022,7 @@
/* draw bone paths
* - in view space
*/
-static void draw_pose_paths(View3D *v3d, Object *ob)
+static void draw_pose_paths(Scene *scene, View3D *v3d, Object *ob)
{
bArmature *arm= ob->data;
bPoseChannel *pchan;
@@ -2547,7 +2547,7 @@
else if(G.f & G_WEIGHTPAINT)
arm->flag |=
ARM_POSEMODE;
- draw_pose_paths(v3d, ob);
+ draw_pose_paths(scene, v3d, ob);
}
}
}
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/drawmesh.c
2008-12-22 09:10:02 UTC (rev 18004)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/drawmesh.c
2008-12-22 09:43:29 UTC (rev 18005)
@@ -452,7 +452,7 @@
return 1;
}
-void draw_mesh_text(Object *ob, int glsl)
+void draw_mesh_text(Scene *scene, Object *ob, int glsl)
{
Mesh *me = ob->data;
DerivedMesh *ddm;
@@ -561,7 +561,7 @@
/* draw game engine text hack */
if(get_ob_property(ob, "Text"))
- draw_mesh_text(ob, 0);
+ draw_mesh_text(scene, ob, 0);
draw_textured_end();
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
2008-12-22 09:10:02 UTC (rev 18004)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
2008-12-22 09:43:29 UTC (rev 18005)
@@ -2824,7 +2824,7 @@
/* 5. start filling the arrays */
/* 6. draw the arrays */
/* 7. clean up */
-static void draw_new_particle_system(View3D *v3d, Base *base, ParticleSystem
*psys, int dt)
+static void draw_new_particle_system(Scene *scene, View3D *v3d, Base *base,
ParticleSystem *psys, int dt)
{
Object *ob=base->object;
ParticleSystemModifierData *psmd;
@@ -5069,7 +5069,7 @@
glDepthMask(GL_FALSE);
for(psys=ob->particlesystem.first; psys; psys=psys->next)
- draw_new_particle_system(v3d, base, psys, dt);
+ draw_new_particle_system(scene, v3d, base, psys, dt);
if(G.f & G_PARTICLEEDIT && ob==OBACT) {
psys= NULL; // XXX PE_get_current(ob);
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
===================================================================
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
2008-12-22 09:10:02 UTC (rev 18004)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
2008-12-22 09:43:29 UTC (rev 18005)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
