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

[Diego Borghetti (Plumiferos)]

Revision: 11869
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11869
Author:   bdiego
Date:     2007-08-28 16:55:23 +0200 (Tue, 28 Aug 2007)

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

Merge from trunk:
	revision 11793
	revision 11814
	revision 11839

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11793
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11814
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11839

Modified Paths:
--------------
    branches/2-44-stable/blender/source/blender/blenkernel/intern/depsgraph.c
    branches/2-44-stable/blender/source/blender/src/buttons_object.c
    branches/2-44-stable/blender/source/blender/src/buttons_shading.c

Modified: branches/2-44-stable/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/2-44-stable/blender/source/blender/blenkernel/intern/depsgraph.c	2007-08-28 11:29:54 UTC (rev 11868)
+++ branches/2-44-stable/blender/source/blender/blenkernel/intern/depsgraph.c	2007-08-28 14:55:23 UTC (rev 11869)
@@ -576,7 +576,7 @@
 			if(con->type==CONSTRAINT_TYPE_FOLLOWPATH)
 				dag_add_relation(dag, node2, node, DAG_RL_DATA_OB|DAG_RL_OB_OB);
 			else {
-				if(obt->type==OB_ARMATURE && str[0])
+				if(obt->type==OB_ARMATURE && str && str[0])
 					dag_add_relation(dag, node2, node, DAG_RL_DATA_OB|DAG_RL_OB_OB);
 				else
 					dag_add_relation(dag, node2, node, DAG_RL_OB_OB);

Modified: branches/2-44-stable/blender/source/blender/src/buttons_object.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/buttons_object.c	2007-08-28 11:29:54 UTC (rev 11868)
+++ branches/2-44-stable/blender/source/blender/src/buttons_object.c	2007-08-28 14:55:23 UTC (rev 11869)
@@ -2743,7 +2743,7 @@
 	uiBlockSetCol(block, TH_BUT_SETTING2);
 	uiDefButF(block, NUM, B_CALCEFFECT, "Normal:",		0,140,150,18, &paf->normfac, -2.0, 2.0, 1, 3, "Let the mesh give the particle a starting speed");
 	uiDefButF(block, NUM, B_CALCEFFECT, "Object:",		0,122,150,18, &paf->obfac, -1.0, 1.0, 1, 3, "Let the object give the particle a starting speed");
-	uiDefButF(block, NUM, B_CALCEFFECT, "Random:",		0,104,150,18, &paf->randfac, 0.0, 2.0, 1, 3, "Give the startingspeed a random variation");
+	uiDefButF(block, NUM, B_CALCEFFECT, "Random:",		0,104,150,18, &paf->randfac, 0.0, 2.0, 1, 3, "Give the starting speed a random variation");
 	uiDefButF(block, NUM, B_CALCEFFECT, "Texture:",		0,86,150,18, &paf->texfac, 0.0, 2.0, 1, 3, "Let the texture give the particle a starting speed");
 	uiDefButF(block, NUM, B_CALCEFFECT, "Damping:",		0,68,150,18, &paf->damp, 0.0, 1.0, 1, 3, "Specify the damping factor");
 	uiBlockSetCol(block, TH_AUTO);

Modified: branches/2-44-stable/blender/source/blender/src/buttons_shading.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/buttons_shading.c	2007-08-28 11:29:54 UTC (rev 11868)
+++ branches/2-44-stable/blender/source/blender/src/buttons_shading.c	2007-08-28 14:55:23 UTC (rev 11869)
@@ -3547,7 +3547,7 @@
 	uiDefButF(block, NUMSLI, 0, "Shape ",	10, 10, 230,20,  &ma->strand_ease, -0.9, 0.9, 2, 0, "Shape of strands, positive value makes it rounder, negative makes it spiky");
 
 	uiBlockSetDirection(block, UI_TOP);
-	
+	BIF_preview_changed(ID_MA);
 	return block;
 }