[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18313] branches/blender2.5/blender/source : 2.5
Ton Roosendaal
ton at blender.org
Sun Jan 4 15:14:07 CET 2009
Revision: 18313
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18313
Author: ton
Date: 2009-01-04 15:14:06 +0100 (Sun, 04 Jan 2009)
Log Message:
-----------
2.5
Think global, act local!
The old favorite G.scene gone! Man... that took almost 2 days.
Also removed G.curscreen and G.edbo.
Not everything could get solved; here's some notes.
- modifiers now store current scene in ModifierData. This is not
meant for permanent, but it can probably stick there until we
cleaned the anim system and depsgraph to cope better with
timing issues.
- Game engine G.scene should become an argument for staring it.
Didn't solve this yet.
- Texture nodes should get scene cfra, but the current implementation
is too tightly wrapped to do it easily.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_action.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_cloth.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_collision.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_constraint.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_displist.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_effect.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_exotic.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_fluidsim.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_font.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_group.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_image.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_ipo.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_key.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_lattice.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_material.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_mball.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_modifier.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_multires.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_node.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_object.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_pointcache.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_scene.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_shrinkwrap.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_softbody.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_text.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_texture.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_writeavi.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_writeffmpeg.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_writeframeserver.h
branches/blender2.5/blender/source/blender/blenkernel/intern/BME_conversions.c
branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/blender2.5/blender/source/blender/blenkernel/intern/action.c
branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
branches/blender2.5/blender/source/blender/blenkernel/intern/cdderivedmesh.c
branches/blender2.5/blender/source/blender/blenkernel/intern/cloth.c
branches/blender2.5/blender/source/blender/blenkernel/intern/collision.c
branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c
branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
branches/blender2.5/blender/source/blender/blenkernel/intern/font.c
branches/blender2.5/blender/source/blender/blenkernel/intern/group.c
branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
branches/blender2.5/blender/source/blender/blenkernel/intern/implicit.c
branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
branches/blender2.5/blender/source/blender/blenkernel/intern/key.c
branches/blender2.5/blender/source/blender/blenkernel/intern/lattice.c
branches/blender2.5/blender/source/blender/blenkernel/intern/library.c
branches/blender2.5/blender/source/blender/blenkernel/intern/material.c
branches/blender2.5/blender/source/blender/blenkernel/intern/mball.c
branches/blender2.5/blender/source/blender/blenkernel/intern/mesh.c
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
branches/blender2.5/blender/source/blender/blenkernel/intern/multires-firstlevel.c
branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
branches/blender2.5/blender/source/blender/blenkernel/intern/shrinkwrap.c
branches/blender2.5/blender/source/blender/blenkernel/intern/softbody.c
branches/blender2.5/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/blender2.5/blender/source/blender/blenkernel/intern/text.c
branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c
branches/blender2.5/blender/source/blender/blenkernel/intern/writeavi.c
branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/blender2.5/blender/source/blender/blenkernel/intern/writeframeserver.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
branches/blender2.5/blender/source/blender/editors/animation/anim_deps.c
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h
branches/blender2.5/blender/source/blender/editors/mesh/editface.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_loop.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_mods.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/mesh/meshtools.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
branches/blender2.5/blender/source/blender/editors/screen/screen_intern.h
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_scene.c
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.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_draw.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_intern.h
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_view.c
branches/blender2.5/blender/source/blender/editors/transform/transform.c
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c
branches/blender2.5/blender/source/blender/editors/transform/transform_orientations.c
branches/blender2.5/blender/source/blender/editors/transform/transform_snap.c
branches/blender2.5/blender/source/blender/gpu/intern/gpu_draw.c
branches/blender2.5/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/blender2.5/blender/source/blender/makesdna/DNA_image_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_modifier_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/blender2.5/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.c
branches/blender2.5/blender/source/blender/nodes/intern/TEX_util.h
branches/blender2.5/blender/source/blender/quicktime/apple/quicktime_export.c
branches/blender2.5/blender/source/blender/quicktime/quicktime_export.h
branches/blender2.5/blender/source/blender/radiosity/extern/include/radio.h
branches/blender2.5/blender/source/blender/radiosity/intern/source/raddisplay.c
branches/blender2.5/blender/source/blender/radiosity/intern/source/radio.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
branches/blender2.5/blender/source/blender/render/extern/include/RE_pipeline.h
branches/blender2.5/blender/source/blender/render/intern/source/convertblender.c
branches/blender2.5/blender/source/blender/render/intern/source/envmap.c
branches/blender2.5/blender/source/blender/render/intern/source/initrender.c
branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c
branches/blender2.5/blender/source/blender/render/intern/source/rayshade.c
branches/blender2.5/blender/source/blender/render/intern/source/texture.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_subwindow.c
branches/blender2.5/blender/source/blender/windowmanager/wm_event_types.h
branches/blender2.5/blender/source/blender/yafray/intern/export_File.cpp
branches/blender2.5/blender/source/blender/yafray/intern/export_Plugin.cpp
branches/blender2.5/blender/source/blender/yafray/intern/yafray_Render.cpp
branches/blender2.5/blender/source/creator/creator.c
branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/blender2.5/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/common/GPC_Engine.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2009-01-04 08:43:42 UTC (rev 18312)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2009-01-04 14:14:06 UTC (rev 18313)
@@ -50,6 +50,7 @@
struct MFace;
struct MTFace;
struct Object;
+struct Scene;
struct Mesh;
struct EditMesh;
struct ModifierData;
@@ -418,36 +419,38 @@
/* Simple function to get me->totvert amount of vertices/normals,
correctly deformed and subsurfered. Needed especially when vertexgroups are involved.
In use now by vertex/weigt paint and particles */
-float *mesh_get_mapped_verts_nors(struct Object *ob);
+float *mesh_get_mapped_verts_nors(struct Scene *scene, struct Object *ob);
/* */
-DerivedMesh *mesh_get_derived_final(struct Object *ob,
+DerivedMesh *mesh_get_derived_final(struct Scene *scene, struct Object *ob,
CustomDataMask dataMask);
-DerivedMesh *mesh_get_derived_deform(struct Object *ob,
+DerivedMesh *mesh_get_derived_deform(struct Scene *scene, struct Object *ob,
CustomDataMask dataMask);
-DerivedMesh *mesh_create_derived_for_modifier(struct Object *ob, struct ModifierData *md);
+DerivedMesh *mesh_create_derived_for_modifier(struct Scene *scene, struct Object *ob, struct ModifierData *md);
-DerivedMesh *mesh_create_derived_render(struct Object *ob,
+DerivedMesh *mesh_create_derived_render(struct Scene *scene, struct Object *ob,
CustomDataMask dataMask);
-DerivedMesh *mesh_create_derived_index_render(struct Object *ob, CustomDataMask dataMask, int index);
+DerivedMesh *mesh_create_derived_index_render(struct Scene *scene, struct Object *ob, CustomDataMask dataMask, int index);
/* same as above but wont use render settings */
-DerivedMesh *mesh_create_derived_view(struct Object *ob,
+DerivedMesh *mesh_create_derived_view(struct Scene *scene, struct Object *ob,
CustomDataMask dataMask);
-DerivedMesh *mesh_create_derived_no_deform(struct Object *ob,
+DerivedMesh *mesh_create_derived_no_deform(struct Scene *scene, struct Object *ob,
float (*vertCos)[3],
CustomDataMask dataMask);
-DerivedMesh *mesh_create_derived_no_deform_render(struct Object *ob,
+DerivedMesh *mesh_create_derived_no_deform_render(struct Scene *scene, struct Object *ob,
float (*vertCos)[3],
CustomDataMask dataMask);
DerivedMesh *editmesh_get_derived_base(struct Object *, struct EditMesh *em);
-DerivedMesh *editmesh_get_derived_cage(struct Object *, struct EditMesh *em, CustomDataMask dataMask);
-DerivedMesh *editmesh_get_derived_cage_and_final(struct Object *, struct EditMesh *em, DerivedMesh **final_r,
+DerivedMesh *editmesh_get_derived_cage(struct Scene *scene, struct Object *,
+ struct EditMesh *em, CustomDataMask dataMask);
+DerivedMesh *editmesh_get_derived_cage_and_final(struct Scene *scene, struct Object *,
+ struct EditMesh *em, DerivedMesh **final_r,
CustomDataMask dataMask);
-void makeDerivedMesh(struct Object *ob, struct EditMesh *em, CustomDataMask dataMask);
+void makeDerivedMesh(struct Scene *scene, struct Object *ob, struct EditMesh *em, CustomDataMask dataMask);
/* returns an array of deform matrices for crazyspace correction, and the
number of modifiers left */
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_action.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_action.h 2009-01-04 08:43:42 UTC (rev 18312)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_action.h 2009-01-04 14:14:06 UTC (rev 18313)
@@ -44,6 +44,7 @@
struct bPose;
struct bPoseChannel;
struct Object;
+struct Scene;
struct ID;
/* Kernel prototypes */
@@ -80,11 +81,9 @@
void make_local_action(struct bAction *act);
/* only for armatures, doing pose actions only too */
-void do_all_pose_actions(struct Object *);
+void do_all_pose_actions(struct Scene *scene, struct Object *);
/* only for objects, doing only 1 channel */
-void do_all_object_actions(struct Object *);
-/* only for Mesh, Curve, Surface, Lattice, doing only Shape channel */
-void do_all_shape_actions(struct Object *);
+void do_all_object_actions(struct Scene *scene, struct Object *);
/**
@@ -134,7 +133,7 @@
/**
* Get the effects of the given action using a workob
*/
-void what_does_obaction(struct Object *ob, struct Object *workob, struct bAction *act, float cframe);
+void what_does_obaction(struct Scene *scene, struct Object *ob, struct Object *workob, struct bAction *act, float cframe);
/**
* Iterate through the action channels of the action
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h 2009-01-04 08:43:42 UTC (rev 18312)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h 2009-01-04 14:14:06 UTC (rev 18313)
@@ -37,6 +37,7 @@
struct bPose;
struct bPoseChannel;
struct bConstraint;
+struct Scene;
struct Object;
struct MDeformVert;
struct Mesh;
@@ -87,7 +88,7 @@
void where_is_armature (struct bArmature *arm);
void where_is_armature_bone(struct Bone *bone, struct Bone *prevbone);
void armature_rebuild_pose(struct Object *ob, struct bArmature *arm);
-void where_is_pose (struct Object *ob);
+void where_is_pose (struct Scene *scene, struct Object *ob);
/* get_objectspace_bone_matrix has to be removed still */
void get_objectspace_bone_matrix (struct Bone* bone, float M_accumulatedMatrix[][4], int root, int posed);
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_cloth.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_cloth.h 2009-01-04 08:43:42 UTC (rev 18312)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_cloth.h 2009-01-04 14:14:06 UTC (rev 18313)
@@ -50,7 +50,7 @@
#include "BKE_collision.h"
struct Object;
-
+struct Scene;
struct MFace;
struct DerivedMesh;
struct ClothModifierData;
@@ -208,7 +208,7 @@
////////////////////////////////////////////////
// needed for implicit.c
-int cloth_bvh_objcollision ( Object *ob, ClothModifierData * clmd, float step, float dt );
+int cloth_bvh_objcollision (Object *ob, ClothModifierData * clmd, float step, float dt );
////////////////////////////////////////////////
@@ -236,7 +236,7 @@
void cloth_free_modifier_extern ( ClothModifierData *clmd );
void cloth_free_modifier ( Object *ob, ClothModifierData *clmd );
void cloth_init ( ClothModifierData *clmd );
-DerivedMesh *clothModifier_do ( ClothModifierData *clmd,Object *ob, DerivedMesh *dm, int useRenderParams, int isFinalCalc );
+DerivedMesh *clothModifier_do ( ClothModifierData *clmd, struct Scene *scene, Object *ob, DerivedMesh *dm, int useRenderParams, int isFinalCalc );
void cloth_update_normals ( ClothVertex *verts, int nVerts, MFace *face, int totface );
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_collision.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_collision.h 2009-01-04 08:43:42 UTC (rev 18312)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_collision.h 2009-01-04 14:14:06 UTC (rev 18313)
@@ -50,6 +50,7 @@
#include "BLI_kdopbvh.h"
struct Object;
+struct Scene;
struct Cloth;
struct MFace;
struct DerivedMesh;
@@ -138,7 +139,7 @@
/////////////////////////////////////////////////
// used in effect.c
/////////////////////////////////////////////////
-CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj);
+CollisionModifierData **get_collisionobjects(struct Scene *scene, Object *self, int *numcollobj);
/////////////////////////////////////////////////
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_constraint.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_constraint.h 2009-01-04 08:43:42 UTC (rev 18312)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_constraint.h 2009-01-04 14:14:06 UTC (rev 18313)
@@ -34,6 +34,7 @@
struct bConstraintTarget;
struct ListBase;
struct Object;
+struct Scene;
struct bConstraintChannel;
struct bPoseChannel;
@@ -41,6 +42,7 @@
/* special struct for use in constraint evaluation */
typedef struct bConstraintOb {
+ struct Scene *scene; /* for system time, part of deglobalization, code nicer later with local time (ton) */
struct Object *ob; /* if pchan, then armature that it comes from, otherwise constraint owner */
struct bPoseChannel *pchan; /* pose channel that owns the constraints being evaluated */
@@ -128,7 +130,7 @@
/* Constraint Evaluation function prototypes */
-struct bConstraintOb *constraints_make_evalob(struct Object *ob, void *subdata, short datatype);
+struct bConstraintOb *constraints_make_evalob(struct Scene *scene, struct Object *ob, void *subdata, short datatype);
void constraints_clear_evalob(struct bConstraintOb *cob);
void constraint_mat_convertspace(struct Object *ob, struct bPoseChannel *pchan, float mat[][4], short from, short to);
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h 2009-01-04 08:43:42 UTC (rev 18312)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h 2009-01-04 14:14:06 UTC (rev 18313)
@@ -34,6 +34,7 @@
struct Curve;
struct ListBase;
struct Object;
+struct Scene;
struct Nurb;
struct ListBase;
struct BezTriple;
@@ -68,9 +69,9 @@
void makeNurbfaces(struct Nurb *nu, float *coord_array, int rowstride);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list