Reverting to 2_2x BPY

I was careful in selectively rolling back revisions, but if you've committed changes unrelated to BPY mixed with BPY changes, I might have reverted those too, so please double check.

3 files changed, 1 insertions, 22 deletions

diff --git a/source/blender/blenkernel/BKE_bad_level_calls.h b/source/blender/blenkernel/BKE_bad_level_calls.h
index ca563bbbaa3..8b9454f1a9d 100644
--- a/source/blender/blenkernel/BKE_bad_level_calls.h
+++ b/source/blender/blenkernel/BKE_bad_level_calls.h
@@ -66,8 +66,6 @@ struct Object;
 struct bPythonConstraint;
 struct bConstraintOb;
 struct bConstraintTarget;
-
-
 void BPY_do_pyscript (struct ID *id, short int event);
 void BPY_clear_script (struct Script *script);
 void BPY_free_compiled_text (struct Text *text);
@@ -80,11 +78,7 @@ int BPY_button_eval(char *expr, double *value);
 /* pyconstraints */
 void BPY_pyconstraint_eval(struct bPythonConstraint *con, struct bConstraintOb *cob, struct ListBase *targets);
 void BPY_pyconstraint_targets(struct bPythonConstraint *con, struct bConstraintTarget *ct);
-/* py id-hash */
-void BPY_idhash_add(void * value);
-void *BPY_idhash_get(struct ID *id);
-void BPY_idhash_remove(struct ID *id);
-void BPY_idhash_invalidate(struct ID *id);
+
 
 /* writefile.c */
 struct Oops;
diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c
index 25c4f099743..55931b50462 100644
--- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c
+++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c
@@ -37,7 +37,6 @@
 #include "BKE_bad_level_calls.h"
 #include "BLI_blenlib.h"
 #include "BPI_script.h"
-#include "DNA_ID.h"
 #include "DNA_texture_types.h"
 #include "DNA_material_types.h"
 #include "DNA_node_types.h"
@@ -137,14 +136,6 @@ void BPY_pyconstraint_eval(struct bPythonConstraint *con, struct bConstraintOb *
 void BPY_pyconstraint_target(struct bPythonConstraint *con, struct bConstraintTarget *ct)
 {
 }
-/* Py ID Hash*/
-void BPY_idhash_add(void *value){}
-void *BPY_idhash_get(ID *id){}
-void BPY_idhash_remove(ID *id)
-{
-	return 0;
-}
-void BPY_idhash_invalidate(ID *id){}
 
 
 /* writefile.c */
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index 6e80a677a7a..e81d3bac655 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -116,9 +116,6 @@
 
 #include "BPI_script.h"
 
-/* for maintaining the python id hash when removeing data */
-#include "BPY_extern.h"
-
 #define MAX_IDPUP		60	/* was 24 */
 
 /* ************* general ************************ */
@@ -435,9 +432,6 @@ void free_libblock(ListBase *lb, void *idv)
 {
 	ID *id= idv;
 	
-	/* invalidate the data if its in the python pool */
-	BPY_idhash_invalidate(id);
-	
 	switch( GS(id->name) ) {	/* GetShort from util.h */
 		case ID_SCE:
 			free_scene((Scene *)id);