[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14993] branches/blender-2.47/source/ blender: branches/blender-2.47

[Diego Borghetti]

Revision: 14993
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14993
Author:   bdiego
Date:     2008-05-27 05:55:06 +0200 (Tue, 27 May 2008)

Log Message:
-----------
branches/blender-2.47

Merge from trunk:
	Revision: 14979                                                                 
	Revision: 14982                                                                 
	Revision: 14987

Modified Paths:
--------------
    branches/blender-2.47/source/blender/python/api2_2x/Particle.c
    branches/blender-2.47/source/blender/src/poseobject.c
    branches/blender-2.47/source/blender/src/transform_conversions.c

Modified: branches/blender-2.47/source/blender/python/api2_2x/Particle.c
===================================================================
--- branches/blender-2.47/source/blender/python/api2_2x/Particle.c	2008-05-27 03:29:43 UTC (rev 14992)
+++ branches/blender-2.47/source/blender/python/api2_2x/Particle.c	2008-05-27 03:55:06 UTC (rev 14993)
@@ -828,7 +828,7 @@
 		/* little hack to calculate hair steps in render mode */
 		psys->renderdata = (void*)(int)1;
 
-		psys_cache_paths(ob, psys, cfra, 0);
+		psys_cache_paths(ob, psys, cfra, 1);
 
 		psys->renderdata = NULL;
 

Modified: branches/blender-2.47/source/blender/src/poseobject.c
===================================================================
--- branches/blender-2.47/source/blender/src/poseobject.c	2008-05-27 03:29:43 UTC (rev 14992)
+++ branches/blender-2.47/source/blender/src/poseobject.c	2008-05-27 03:55:06 UTC (rev 14993)
@@ -659,6 +659,10 @@
 						free_constraints(&pchan->constraints);
 						copy_constraints(&pchan->constraints, &pchanact->constraints);
 						pchan->constflag = pchanact->constflag;
+						
+						if (ob->pose) {
+							ob->pose->flag |= POSE_RECALC;
+						}
 					}
 						break;
 					case 6: /* Transform Locks */
@@ -741,6 +745,10 @@
 		}
 		BLI_freelistN(&const_copy);
 		update_pose_constraint_flags(ob->pose); /* we could work out the flags but its simpler to do this */
+		
+		if (ob->pose) {
+			ob->pose->flag |= POSE_RECALC;
+		}
 	}
 	
 	DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);	// and all its relations

Modified: branches/blender-2.47/source/blender/src/transform_conversions.c
===================================================================
--- branches/blender-2.47/source/blender/src/transform_conversions.c	2008-05-27 03:29:43 UTC (rev 14992)
+++ branches/blender-2.47/source/blender/src/transform_conversions.c	2008-05-27 03:55:06 UTC (rev 14993)
@@ -4054,6 +4054,7 @@
 		t->flag |= T_POINTS;
 	}
 	else {
+		t->flag &= ~T_PROP_EDIT; /* no proportional edit in object mode */
 		createTransObject(t);
 		t->flag |= T_OBJECT;
 	}