[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11001] branches/2-44-stable/blender/ source/blender: branches/2-44-stable

[Diego Borghetti (Plumiferos)]

Revision: 11001
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11001
Author:   bdiego
Date:     2007-06-21 16:04:07 +0200 (Thu, 21 Jun 2007)

Log Message:
-----------
branches/2-44-stable

Merge from trunk:

revision 10967:10968 (Bugfix 6780)
    Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10968

revision 10975:10976
    Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10976

revision 10977:10978
    Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10978

revision 10991:10992
    Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10992

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10967
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10975
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10977
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10991

Modified Paths:
--------------
    branches/2-44-stable/blender/source/blender/blenkernel/intern/modifier.c
    branches/2-44-stable/blender/source/blender/python/api2_2x/Draw.c
    branches/2-44-stable/blender/source/blender/src/editnla.c
    branches/2-44-stable/blender/source/blender/src/editobject.c

Modified: branches/2-44-stable/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/2-44-stable/blender/source/blender/blenkernel/intern/modifier.c	2007-06-21 13:19:33 UTC (rev 11000)
+++ branches/2-44-stable/blender/source/blender/blenkernel/intern/modifier.c	2007-06-21 14:04:07 UTC (rev 11001)
@@ -2577,7 +2577,14 @@
 	DisplaceModifierData *dmd = (DisplaceModifierData*) md;
 	DisplaceModifierData *tdmd = (DisplaceModifierData*) target;
 
-	*tdmd = *dmd;
+	tdmd->texture = dmd->texture;
+	tdmd->strength = dmd->strength;
+	tdmd->direction = dmd->direction;
+	strncpy(tdmd->defgrp_name, dmd->defgrp_name, 32);
+	tdmd->midlevel = dmd->midlevel;
+	tdmd->texmapping = dmd->texmapping;
+	tdmd->map_object = dmd->map_object;
+	strncpy(tdmd->uvlayer_name, dmd->uvlayer_name, 32);
 }
 
 CustomDataMask displaceModifier_requiredDataMask(ModifierData *md)
@@ -4327,7 +4334,7 @@
 	float minfac =
 	  (float)(1.0 / exp(wmd->width * wmd->narrow * wmd->width * wmd->narrow));
 	float lifefac = wmd->height;
-	float (*tex_co)[3];
+	float (*tex_co)[3] = NULL;
 
 	if(wmd->flag & MOD_WAVE_NORM && ob->type == OB_MESH)
 		mvert = dm->getVertArray(dm);

Modified: branches/2-44-stable/blender/source/blender/python/api2_2x/Draw.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/api2_2x/Draw.c	2007-06-21 13:19:33 UTC (rev 11000)
+++ branches/2-44-stable/blender/source/blender/python/api2_2x/Draw.c	2007-06-21 14:04:07 UTC (rev 11001)
@@ -738,7 +738,7 @@
 static void exec_but_callback(void *pyobj, void *data)
 {
 	PyObject *result;
-	PyObject * pyvalue;
+	PyObject *pyvalue = NULL;
 	uiBut *but = (uiBut *)data;
 	PyObject *arg;
 	PyObject *callback = (PyObject *)pyobj;

Modified: branches/2-44-stable/blender/source/blender/src/editnla.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/editnla.c	2007-06-21 13:19:33 UTC (rev 11000)
+++ branches/2-44-stable/blender/source/blender/src/editnla.c	2007-06-21 14:04:07 UTC (rev 11001)
@@ -1261,10 +1261,10 @@
 		}
 	}
 	
+	recalc_all_ipos();	// bad
 	synchronize_action_strips();
 	
 	BIF_undo_push("Delete NLA keys");
-	recalc_all_ipos();	// bad
 	allspace(REMAKEIPO,0);
 	allqueue (REDRAWVIEW3D, 0);
 	allqueue(REDRAWNLA, 0);
@@ -2106,11 +2106,11 @@
 			case XKEY:
 				if (mval[0]>=NLAWIDTH) {
 					if (okee("Erase selected?")) {
-						remove_marker();
-						
 						delete_nlachannel_keys();
 						update_for_newframe_muted();
 						
+						remove_marker();
+						
 						allqueue(REDRAWTIME, 0);
 						allqueue(REDRAWIPO, 0);
 						allqueue(REDRAWACTION, 0);

Modified: branches/2-44-stable/blender/source/blender/src/editobject.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/editobject.c	2007-06-21 13:19:33 UTC (rev 11000)
+++ branches/2-44-stable/blender/source/blender/src/editobject.c	2007-06-21 14:04:07 UTC (rev 11001)
@@ -1612,6 +1612,18 @@
 	if (ob->type==OB_ARMATURE){
 		arm= base->object->data;
 		if (!arm) return;
+		/*
+		 * The function object_data_is_libdata make a problem here, the
+		 * check for ob->proxy return 0 and let blender enter to edit mode
+		 * this causa a crash when you try leave the edit mode.
+		 * The problem is that i can't remove the ob->proxy check from
+		 * object_data_is_libdata that prevent the bugfix #6614, so
+		 * i add this little hack here.
+		 */
+		if(arm->id.lib) {
+			error_libdata();
+			return;
+		}
 		ok=1;
 		G.obedit=ob;
 		make_editArmature();