Revision: 21792
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21792
Author: campbellbarton
Date: 2009-07-22 11:41:41 +0200 (Wed, 22 Jul 2009)
Log Message:
-----------
remove scriptlinks,
they were not working and we have plans for better script integration in 2.5
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/BKE_object.h
branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/material.c
branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
branches/blender2.5/blender/source/blender/blenkernel/intern/world.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/screen/area.c
branches/blender2.5/blender/source/blender/editors/screen/screen_edit.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_text/text_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/blender2.5/blender/source/blender/makesdna/DNA_camera_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_lamp_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_material_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_object_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_screen_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_world_types.h
branches/blender2.5/blender/source/blender/makesdna/intern/makesdna.c
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_lamp.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_world.c
branches/blender2.5/blender/source/blender/python/BPY_extern.h
branches/blender2.5/blender/source/blender/python/intern/stubs.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_files.c
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/makesdna/DNA_scriptlink_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scriptlink.c
branches/blender2.5/blender/source/blender/python/intern/bpy_scriptlink.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_object.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_object.h
2009-07-22 06:31:36 UTC (rev 21791)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_object.h
2009-07-22 09:41:41 UTC (rev 21792)
@@ -98,11 +98,6 @@
void set_no_parent_ipo(int val);
-void disable_where_script(short on);
-int during_script(void);
-void disable_where_scriptlink(short on);
-int during_scriptlink(void);
-
void where_is_object_time(struct Scene *scene, struct Object *ob, float ctime);
void where_is_object(struct Scene *scene, struct Object *ob);
void where_is_object_simul(struct Scene *scene, struct Object *ob);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
2009-07-22 06:31:36 UTC (rev 21791)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
2009-07-22 09:41:41 UTC (rev 21792)
@@ -387,10 +387,6 @@
/* now tag update flags, to ensure deformers get calculated on redraw */
DAG_scene_update_flags(CTX_data_scene(C), CTX_data_scene(C)->lay);
- if (G.f & G_DOSCRIPTLINKS) {
- /* there's an onload scriptlink to execute in screenmain */
-// XXX mainqenter(ONLOAD_SCRIPT, 1);
- }
if (G.sce != filename) /* these are the same at times, should never
copy to the same location */
strcpy(G.sce, filename);
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
2009-07-22 06:31:36 UTC (rev 21791)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
2009-07-22 09:41:41 UTC (rev 21792)
@@ -1997,8 +1997,6 @@
}
}
- if(ob->scriptlink.totscript) ob->recalc |= OB_RECALC_OB;
-
if(ob->parent) {
/* motion path or bone child */
if(ob->parent->type==OB_CURVE || ob->parent->type==OB_ARMATURE)
ob->recalc |= OB_RECALC_OB;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2009-07-22 06:31:36 UTC (rev 21791)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
2009-07-22 09:41:41 UTC (rev 21792)
@@ -1900,16 +1900,10 @@
if(BLI_testextensie(str,".ble")) str[ strlen(str)-4]= 0;
if(BLI_testextensie(str,".stl")==0) strcat(str, ".stl");
- if (!during_script()) {
- if (BLI_exists(str))
- ; //XXX if(saveover(str)==0)
- //XXX return;
- }
-
fpSTL= fopen(str, "wb");
if(fpSTL==NULL) {
- if (!during_script()) ; //XXX error("Can't write file");
+ //XXX error("Can't write file");
return;
}
strcpy(temp_dir, str);
@@ -2233,11 +2227,11 @@
if(BLI_testextensie(str,".blend")) str[ strlen(str)-6]= 0;
if(BLI_testextensie(str,".ble")) str[ strlen(str)-4]= 0;
if(BLI_testextensie(str,".wrl")==0) strcat(str, ".wrl");
- //XXX saveover() if(!during_script() && saveover(str)==0) return;
+ //XXX saveover() if(saveover(str)==0) return;
fp= fopen(str, "w");
- if(fp==NULL && !during_script()) {
+ if(fp==NULL) {
//XXX error("Can't write file");
return;
}
@@ -2544,15 +2538,15 @@
if(BLI_testextensie(str,".ble")) str[ strlen(str)-4]= 0;
if(BLI_testextensie(str,".dxf")==0) strcat(str, ".dxf");
- if (!during_script()) {
- if (BLI_exists(str))
- ; //XXX if(saveover(str)==0)
- // return;
+
+ if (BLI_exists(str)) {
+ ; //XXX if(saveover(str)==0)
+ // return;
}
fp= fopen(str, "w");
- if(fp==NULL && !during_script()) {
+ if(fp==NULL) {
//XXX error("Can't write file");
return;
}
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/material.c
2009-07-22 06:31:36 UTC (rev 21791)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/material.c
2009-07-22 09:41:41 UTC (rev 21792)
@@ -80,10 +80,6 @@
{
MTex *mtex;
int a;
-
-#ifndef DISABLE_PYTHON
- BPY_free_scriptlink(&ma->scriptlink);
-#endif
for(a=0; a<MAX_MTEX; a++) {
mtex= ma->mtex[a];
@@ -210,10 +206,6 @@
id_us_plus((ID *)man->mtex[a]->tex);
}
}
-
-#ifndef DISABLE_PYTHON
- BPY_copy_scriptlink(&ma->scriptlink);
-#endif
if(ma->ramp_col) man->ramp_col= MEM_dupallocN(ma->ramp_col);
if(ma->ramp_spec) man->ramp_spec= MEM_dupallocN(ma->ramp_spec);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
2009-07-22 06:31:36 UTC (rev 21791)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
2009-07-22 09:41:41 UTC (rev 21792)
@@ -266,10 +266,6 @@
free_actuators(&ob->actuators);
free_constraints(&ob->constraints);
-
-#ifndef DISABLE_PYTHON
- BPY_free_scriptlink(&ob->scriptlink);
-#endif
if(ob->pd){
if(ob->pd->tex)
@@ -645,10 +641,7 @@
camn= copy_libblock(cam);
camn->adt= BKE_copy_animdata(cam->adt);
-
-#ifndef DISABLE_PYTHON
- BPY_copy_scriptlink(&camn->scriptlink);
-#endif
+
return camn;
}
@@ -797,9 +790,7 @@
#endif // XXX old animation system
if (la->preview) lan->preview = BKE_previewimg_copy(la->preview);
-#ifndef DISABLE_PYTHON
- BPY_copy_scriptlink(&la->scriptlink);
-#endif
+
return lan;
}
@@ -857,9 +848,6 @@
void free_camera(Camera *ca)
{
-#ifndef DISABLE_PYTHON
- BPY_free_scriptlink(&ca->scriptlink);
-#endif
BKE_free_animdata((ID *)ca);
}
@@ -868,11 +856,6 @@
MTex *mtex;
int a;
- /* scriptlinks */
-#ifndef DISABLE_PYTHON
- BPY_free_scriptlink(&la->scriptlink);
-#endif
-
for(a=0; a<MAX_MTEX; a++) {
mtex= la->mtex[a];
if(mtex && mtex->tex) mtex->tex->id.us--;
@@ -1210,9 +1193,7 @@
modifier_copyData(md, nmd);
BLI_addtail(&obn->modifiers, nmd);
}
-#ifndef DISABLE_PYTHON
- BPY_copy_scriptlink(&ob->scriptlink);
-#endif
+
obn->prop.first = obn->prop.last = NULL;
copy_properties(&obn->prop, &ob->prop);
@@ -1843,26 +1824,6 @@
no_parent_ipo= val;
}
-static int during_script_flag=0;
-void disable_where_script(short on)
-{
- during_script_flag= on;
-}
-
-int during_script(void) {
- return during_script_flag;
-}
-
-static int during_scriptlink_flag=0;
-void disable_where_scriptlink(short on)
-{
- during_scriptlink_flag= on;
-}
-
-int during_scriptlink(void) {
- return during_scriptlink_flag;
-}
-
void where_is_object_time(Scene *scene, Object *ob, float ctime)
{
float *fp1, *fp2, slowmat[4][4] = MAT4_UNITY;
@@ -1962,11 +1923,6 @@
constraints_clear_evalob(cob);
}
-#ifndef DISABLE_PYTHON
- if(ob->scriptlink.totscript && !during_script()) {
- if (G.f & G_DOSCRIPTLINKS) BPY_do_pyscript((ID *)ob,
SCRIPT_REDRAW);
- }
-#endif
/* set negative scale flag in object */
Crossf(vec, ob->obmat[0], ob->obmat[1]);
@@ -2338,9 +2294,6 @@
}
else
where_is_object(scene, ob);
-#ifndef DISABLE_PYTHON
- if (G.f & G_DOSCRIPTLINKS) BPY_do_pyscript((ID *)ob,
SCRIPT_OBJECTUPDATE);
-#endif
}
if(ob->recalc & OB_RECALC_DATA) {
@@ -2429,9 +2382,6 @@
psys_get_modifier(ob,
psys)->flag &= ~eParticleSystemFlag_psys_updated;
}
}
-#ifndef DISABLE_PYTHON
- if (G.f & G_DOSCRIPTLINKS) BPY_do_pyscript((ID *)ob,
SCRIPT_OBDATAUPDATE);
-#endif
}
/* the no-group proxy case, we call update */
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
2009-07-22 06:31:36 UTC (rev 21791)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
2009-07-22 09:41:41 UTC (rev 21792)
@@ -54,7 +54,6 @@
#include "DNA_meta_types.h"
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
-#include "DNA_scriptlink_types.h"
#include "DNA_texture_types.h"
#include "DNA_userdef_types.h"
@@ -142,10 +141,6 @@
BLI_freelistN(&sce->base);
seq_free_editing(sce->ed);
-
-#ifndef DISABLE_PYTHON
- BPY_free_scriptlink(&sce->scriptlink);
-#endif
BKE_free_animdata((ID *)sce);
BKE_keyingsets_free(&sce->keyingsets);
@@ -398,9 +393,6 @@
ob->ctime= -1234567.0; /* force ipo to be calculated later */
}
/* no full animation update, this to enable render code to work (render
code calls own animation updates) */
-
- /* do we need FRAMECHANGED in set_scene? */
-// if (G.f & G_DOSCRIPTLINKS) BPY_do_all_scripts(SCRIPT_FRAMECHANGED, 0);
}
/* called from creator.c */
@@ -659,9 +651,6 @@
/* clear animation overrides */
// XXX TODO...
-#ifndef DISABLE_PYTHON
- if (G.f & G_DOSCRIPTLINKS) BPY_do_all_scripts(SCRIPT_FRAMECHANGED, 0);
-#endif
/* sets first, we allow per definition current scene to have
dependencies on sets */
for(sce= sce->set; sce; sce= sce->set)
scene_update(sce, lay);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
2009-07-22 06:31:36 UTC (rev 21791)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
2009-07-22 09:41:41 UTC (rev 21792)
@@ -291,10 +291,6 @@
BKE_spacedata_freelist(&sa->spacedata);
BLI_freelistN(&sa->actionzones);
-
-#ifndef DISABLE_PYTHON
- BPY_free_scriptlink(&sa->scriptlink);
-#endif
}
/* don't free screen itself */
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/world.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/world.c
2009-07-22 06:31:36 UTC (rev 21791)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/world.c
2009-07-22 09:41:41 UTC (rev 21792)
@@ -36,7 +36,6 @@
#include "DNA_world_types.h"
#include "DNA_texture_types.h"
-#include "DNA_scriptlink_types.h"
#include "DNA_scene_types.h"
#include "DNA_object_types.h"
#include "DNA_camera_types.h"
@@ -66,10 +65,7 @@
{
MTex *mtex;
int a;
-
-#ifndef DISABLE_PYTHON
- BPY_free_scriptlink(&wrld->scriptlink);
-#endif
+
for(a=0; a<MAX_MTEX; a++) {
mtex= wrld->mtex[a];
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
