[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33295] trunk/blender: bugfix [#24884] Loading any preset leads to crash

[Campbell Barton]

Revision: 33295
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33295
Author:   campbellbarton
Date:     2010-11-24 19:37:54 +0100 (Wed, 24 Nov 2010)

Log Message:
-----------
bugfix [#24884] Loading any preset leads to crash
caused by own recent commit. update uv operator template too.

Modified Paths:
--------------
    trunk/blender/release/scripts/templates/operator_uv.py
    trunk/blender/source/blender/python/intern/bpy_interface.c

Modified: trunk/blender/release/scripts/templates/operator_uv.py
===================================================================
--- trunk/blender/release/scripts/templates/operator_uv.py	2010-11-24 18:02:35 UTC (rev 33294)
+++ trunk/blender/release/scripts/templates/operator_uv.py	2010-11-24 18:37:54 UTC (rev 33295)
@@ -11,6 +11,8 @@
 
     if not mesh.uv_textures:
         uvtex = bpy.ops.mesh.uv_texture_add()
+    else:
+        uvtex = mesh.uv_textures.active
 
     # adjust UVs
     for i, uv in enumerate(uvtex.data):

Modified: trunk/blender/source/blender/python/intern/bpy_interface.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_interface.c	2010-11-24 18:02:35 UTC (rev 33294)
+++ trunk/blender/source/blender/python/intern/bpy_interface.c	2010-11-24 18:37:54 UTC (rev 33295)
@@ -380,12 +380,14 @@
 	if(py_dict) {
 #ifdef PYMODULE_CLEAR_WORKAROUND
 		PyObject *py_dict_back= PyDict_Copy(py_dict);
+		Py_INCREF(py_dict);
 #endif
 		/* normal */
 		PyDict_SetItemString(PyThreadState_GET()->interp->modules, "__main__", Py_None);
 #ifdef PYMODULE_CLEAR_WORKAROUND
 		PyDict_Clear(py_dict);
 		PyDict_Update(py_dict, py_dict_back);
+		Py_DECREF(py_dict);
 		Py_DECREF(py_dict_back);
 #endif
 #undef PYMODULE_CLEAR_WORKAROUND