Revision: 28506
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28506
Author: campbellbarton
Date: 2010-04-29 17:38:43 +0200 (Thu, 29 Apr 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28496:28505
Modified Paths:
--------------
branches/render25/source/blender/blenkernel/BKE_constraint.h
branches/render25/source/blender/blenkernel/intern/action.c
branches/render25/source/blender/blenkernel/intern/armature.c
branches/render25/source/blender/blenkernel/intern/brush.c
branches/render25/source/blender/blenkernel/intern/constraint.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/editors/armature/poseobject.c
branches/render25/source/blender/editors/datafiles/B.blend.c
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/object/object_constraint.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/object/object_select.c
branches/render25/source/blender/editors/space_api/spacetypes.c
branches/render25/source/blender/editors/space_logic/logic_intern.h
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/makesrna/RNA_access.h
branches/render25/source/blender/makesrna/RNA_enum_types.h
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_sensor.c
branches/render25/source/blender/makesrna/intern/rna_space.c
branches/render25/source/gameengine/Converter/BL_ArmatureObject.cpp
Added Paths:
-----------
branches/render25/source/blender/editors/include/ED_logic.h
branches/render25/source/blender/editors/space_logic/logic_ops.c
Modified: branches/render25/source/blender/blenkernel/BKE_constraint.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_constraint.h
2010-04-29 15:31:53 UTC (rev 28505)
+++ branches/render25/source/blender/blenkernel/BKE_constraint.h
2010-04-29 15:38:43 UTC (rev 28506)
@@ -122,7 +122,7 @@
void unique_constraint_name(struct bConstraint *con, struct ListBase *list);
void free_constraints(struct ListBase *list);
-void copy_constraints(struct ListBase *dst, const struct ListBase *src);
+void copy_constraints(struct ListBase *dst, const struct ListBase *src, int
do_extern);
void relink_constraints(struct ListBase *list);
void id_loop_constraints(struct ListBase *list, ConstraintIDFunc func, void
*userdata);
void free_constraint_data(struct bConstraint *con);
Modified: branches/render25/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/action.c 2010-04-29
15:31:53 UTC (rev 28505)
+++ branches/render25/source/blender/blenkernel/intern/action.c 2010-04-29
15:38:43 UTC (rev 28506)
@@ -493,7 +493,7 @@
for (pchan=outPose->chanbase.first; pchan; pchan=pchan->next) {
// TODO: rename this argument...
if (copycon) {
- copy_constraints(&listb, &pchan->constraints); //
copy_constraints NULLs listb
+ copy_constraints(&listb, &pchan->constraints, TRUE);
// copy_constraints NULLs listb
pchan->constraints= listb;
pchan->path= NULL; // XXX remove this line when the new
motionpaths are ready... (depreceated code)
pchan->mpath= NULL; /* motion paths should not get
copied yet... */
@@ -667,7 +667,7 @@
pchan->iklinweight= pchan_from->iklinweight;
/* constraints */
- copy_constraints(&pchan->constraints, &pchan_from->constraints);
+ copy_constraints(&pchan->constraints, &pchan_from->constraints, TRUE);
/* id-properties */
if(pchan->prop) {
Modified: branches/render25/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/armature.c
2010-04-29 15:31:53 UTC (rev 28505)
+++ branches/render25/source/blender/blenkernel/intern/armature.c
2010-04-29 15:38:43 UTC (rev 28506)
@@ -1568,9 +1568,11 @@
* 1. extract constraints not from proxy
(CONSTRAINT_PROXY_LOCAL) from pchan's constraints
* 2. copy proxy-pchan's constraints on-to new
* 3. add extracted local constraints back on top
+ *
+ * note for copy_constraints: when copying
constraints, disable 'do_extern' otherwise we get the libs direct linked in
this blend.
*/
extract_proxylocal_constraints(&proxylocal_constraints,
&pchan->constraints);
- copy_constraints(&pchanw.constraints,
&pchanp->constraints);
+ copy_constraints(&pchanw.constraints,
&pchanp->constraints, FALSE);
addlisttolist(&pchanw.constraints,
&proxylocal_constraints);
/* constraints - set target ob pointer to own object */
Modified: branches/render25/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/brush.c 2010-04-29
15:31:53 UTC (rev 28505)
+++ branches/render25/source/blender/blenkernel/intern/brush.c 2010-04-29
15:38:43 UTC (rev 28506)
@@ -75,7 +75,7 @@
brush->rgb[2]= 1.0f;
brush->alpha= 0.2f;
brush->size= 25;
- brush->spacing= 7.5f;
+ brush->spacing= 3.5f;
brush->smooth_stroke_radius= 75;
brush->smooth_stroke_factor= 0.9;
brush->rate= 0.1f;
Modified: branches/render25/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/constraint.c
2010-04-29 15:31:53 UTC (rev 28505)
+++ branches/render25/source/blender/blenkernel/intern/constraint.c
2010-04-29 15:38:43 UTC (rev 28506)
@@ -4131,7 +4131,7 @@
}
/* duplicate all of the constraints in a constraint stack */
-void copy_constraints (ListBase *dst, const ListBase *src)
+void copy_constraints (ListBase *dst, const ListBase *src, int do_extern)
{
bConstraint *con, *srccon;
@@ -4149,10 +4149,13 @@
/* perform custom copying operations if needed */
if (cti->copy_data)
cti->copy_data(con, srccon);
-
- /* go over used ID-links for this constraint to ensure
that they are valid for proxies */
- if (cti->id_looper)
- cti->id_looper(con, con_extern_cb, NULL);
+
+ /* for proxies we dont want to make extern */
+ if(do_extern) {
+ /* go over used ID-links for this constraint to
ensure that they are valid for proxies */
+ if (cti->id_looper)
+ cti->id_looper(con, con_extern_cb,
NULL);
+ }
}
}
}
Modified: branches/render25/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/object.c 2010-04-29
15:31:53 UTC (rev 28505)
+++ branches/render25/source/blender/blenkernel/intern/object.c 2010-04-29
15:38:43 UTC (rev 28506)
@@ -1288,7 +1288,7 @@
armature_rebuild_pose(obn, obn->data);
}
defgroup_copy_list(&obn->defbase, &ob->defbase);
- copy_constraints(&obn->constraints, &ob->constraints);
+ copy_constraints(&obn->constraints, &ob->constraints, TRUE);
obn->mode = 0;
obn->sculpt = NULL;
Modified: branches/render25/source/blender/editors/armature/poseobject.c
===================================================================
--- branches/render25/source/blender/editors/armature/poseobject.c
2010-04-29 15:31:53 UTC (rev 28505)
+++ branches/render25/source/blender/editors/armature/poseobject.c
2010-04-29 15:38:43 UTC (rev 28506)
@@ -691,7 +691,7 @@
/* copy constraints to tmpbase
and apply 'local' tags before
* appending to list of
constraints for this channel
*/
-
copy_constraints(&tmp_constraints, &pchanact->constraints);
+
copy_constraints(&tmp_constraints, &pchanact->constraints, TRUE);
if ((ob->proxy) &&
(pchan->bone->layer & arm->layer_protected)) {
bConstraint *con;
@@ -800,7 +800,7 @@
/* copy constraints to tmpbase and apply
'local' tags before
* appending to list of constraints for this
channel
*/
- copy_constraints(&tmp_constraints, &const_copy);
+ copy_constraints(&tmp_constraints, &const_copy,
TRUE);
if ((ob->proxy) && (pchan->bone->layer &
arm->layer_protected)) {
bConstraint *con;
Modified: branches/render25/source/blender/editors/datafiles/B.blend.c
===================================================================
--- branches/render25/source/blender/editors/datafiles/B.blend.c
2010-04-29 15:31:53 UTC (rev 28505)
+++ branches/render25/source/blender/editors/datafiles/B.blend.c
2010-04-29 15:38:43 UTC (rev 28506)
@@ -1,805 +1,825 @@
/* DataToC output of file <B_blend> */
-int datatoc_B_blend_size= 366384;
+int datatoc_B_blend_size= 374536;
char datatoc_B_blend[]= {
- 66, 76, 69, 78, 68, 69, 82, 95,118, 50, 53, 50, 82, 69, 78, 68,
- 32, 0, 0, 0,144,141,194,191, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0,
0,250, 0, 0, 0, 83, 99,101,110,101, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 76, 79,
66, 16, 1, 0, 0,144,141,194,191,200, 0, 0, 0,
- 1, 0, 0, 0, 32, 32, 32, 53, 5, 0, 0, 0,250, 0, 0, 0, 1, 0, 0,
1, 64,186,233, 9,152,125,236, 9, 0, 16, 0, 0,
-128, 0, 4, 0, 60,109,101,109,111,114,121, 50, 62, 0,129,182, 40,168, 13,
8, 1, 0, 0, 0,244,159,242,183, 48,168,242,183,
-119,215,155,124,164,142,194,191, 41, 75,241,183,148,142,194,191, 40,168, 13,
8,136,142,194,191,212,167,242,183, 24, 0, 0, 0,
-104, 82, 93,181, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
15,145,194,191, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,148,142,194,191,136,142,194,191, 25, 0, 0,
0, 0, 0, 0, 0,208,142,194,191,120,166,242,183,
- 85,217, 39, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,171,121,247,181,180,144,194,191,255,255,255,255,204, 15,255, 9,
- 44,144,194,191,212, 15,255, 9,180,144,194,191, 12, 0, 0,
0,176,130,138,179, 77,125,142,182, 0, 0, 0, 0, 24, 98, 98, 9,
-216,226,182,182, 32, 25,150,182, 0, 0, 0, 0, 4, 0, 0, 0,249, 1, 0,
0, 1, 0, 0, 0,105, 62,249, 8,168,142,194,191,
-130, 19,194, 8, 0,146,194,191, 92, 0, 0, 0, 47, 0, 0,
0,120,166,242,183, 87, 77, 0, 0,164, 0, 0, 0, 24, 38,232, 9,
-108, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 87, 77, 87,105,110, 77, 97,110,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,232, 38,232, 9,232, 38,232, 9, 3, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0,
0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0,208,125,109, 9,208,125,109, 9,208,125,109, 9,
-232,186,107, 9,232,186,107, 9,232,186,107, 9, 68, 65, 84, 65,148, 0, 0,
0,232, 38,232, 9,109, 1, 0, 0, 1, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0,168, 55,111, 9, 1, 0, 0, 0, 0, 0, 0,
0, 64,186,233, 9, 0, 0, 0, 0,115, 99,114,101,
-101,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 28, 0,
-248, 4,203, 3, 0, 0, 0, 0, 0, 0,238, 3, 0, 0, 0, 0, 0, 0, 0,
0, 72,211,115, 9,200,188,107, 9, 0, 0, 0, 0,
- 3, 0, 0, 0, 0, 0, 0, 0,152,165,115, 9, 0, 0, 0, 0, 0, 0, 0,
0, 96,187,107, 9,216,187,107, 9, 80,188,107, 9,
- 80,188,107, 9,200,188,107, 9, 72,217,107, 9, 0, 0, 0, 0, 0, 0, 0,
0, 83, 78, 0, 0,140, 0, 0, 0,168, 39,232, 9,
-194, 0, 0, 0, 1, 0, 0, 0,120, 13,233, 9, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 83, 82, 65,110,105,109, 97,116,
-105,111,110, 0, 46, 48, 48, 49, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0,216,189,108, 9,
-224, 43,232, 9,184, 85,237, 9,224, 50,232, 9, 40, 51,232, 9, 48,254,232,
9, 0, 0, 0, 0, 0, 0, 0, 0,152,125,236, 9,
+ 66, 76, 69, 78, 68, 69, 82, 95,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
