[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46794] branches/soc-2011-tomato: svn merge ^/trunk/blender -r46714:46724 --- before tile branch merge
Campbell Barton
ideasman42 at gmail.com
Sat May 19 13:11:01 CEST 2012
Revision: 46794
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46794
Author: campbellbarton
Date: 2012-05-19 11:11:00 +0000 (Sat, 19 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46714:46724 --- before tile branch merge
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46714
Modified Paths:
--------------
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_animation.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sequencer_api.c
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46714
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46724
Modified: branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py
===================================================================
--- branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py 2012-05-19 10:10:49 UTC (rev 46793)
+++ branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_scene.py 2012-05-19 11:11:00 UTC (rev 46794)
@@ -93,14 +93,6 @@
row.prop(unit, "use_separate")
-def draw_keyingset_options(data, layout):
- # NOTE: keep in sync with rna_def_common_keying_flags() in rna_animation.c
- # These are defined out like this because the standard names are too long
- layout.prop_enum(data, "bl_options", text="Only Needed", value='INSERTKEY_NEEDED')
- layout.prop_enum(data, "bl_options", text="Visual Keying", value='INSERTKEY_VISUAL')
- layout.prop_enum(data, "bl_options", text="XYZ=RGB Coloring", value='INSERTKEY_XYZ_TO_RGB')
-
-
class SCENE_PT_keying_sets(SceneButtonsPanel, Panel):
bl_label = "Keying Sets"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
@@ -132,7 +124,7 @@
col = row.column(align=True)
col.label(text="Keyframing Settings:")
- draw_keyingset_options(ks, col)
+ col.prop(ks, "bl_options")
class SCENE_PT_keying_set_paths(SceneButtonsPanel, Panel):
@@ -188,7 +180,7 @@
col = row.column(align=True)
col.label(text="Keyframing Settings:")
- draw_keyingset_options(ks, col)
+ col.prop(ksp, "bl_options")
class SCENE_PT_physics(SceneButtonsPanel, Panel):
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2012-05-19 10:10:49 UTC (rev 46793)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2012-05-19 11:11:00 UTC (rev 46794)
@@ -4875,8 +4875,8 @@
if (base->object==NULL) {
BKE_reportf_wrap(fd->reports, RPT_ERROR,
- "LIB ERROR: Object lost from scene:'%s\'\n",
- sce->id.name+2);
+ "LIB ERROR: Object lost from scene:'%s\'",
+ sce->id.name + 2);
BLI_remlink(&sce->base, base);
if (base==sce->basact) sce->basact= NULL;
MEM_freeN(base);
@@ -7290,8 +7290,8 @@
if (prop) {
BKE_reportf_wrap(fd->reports, RPT_WARNING,
"Game property name conflict in object: \"%s\".\nText objects reserve the "
- "[\"Text\"] game property to change their content through Logic Bricks.\n",
- ob->id.name+2);
+ "[\"Text\"] game property to change their content through Logic Bricks.",
+ ob->id.name + 2);
}
}
}
@@ -9131,7 +9131,7 @@
/* printf and reports for now... its important users know this */
BKE_reportf_wrap(basefd->reports, RPT_INFO,
- "read library: '%s', '%s'\n",
+ "read library: '%s', '%s'",
mainptr->curlib->filepath, mainptr->curlib->name);
fd= blo_openblenderfile(mainptr->curlib->filepath, basefd->reports);
@@ -9178,7 +9178,7 @@
if (fd==NULL) {
BKE_reportf_wrap(basefd->reports, RPT_ERROR,
- "Can't find lib '%s'\n",
+ "Can't find lib '%s'",
mainptr->curlib->filepath);
}
}
@@ -9197,7 +9197,7 @@
append_id_part(fd, mainptr, id, &realid);
if (!realid) {
BKE_reportf_wrap(fd->reports, RPT_ERROR,
- "LIB ERROR: %s:'%s' missing from '%s'\n",
+ "LIB ERROR: %s:'%s' missing from '%s'",
BKE_idcode_to_name(GS(id->name)),
id->name+2, mainptr->curlib->filepath);
}
@@ -9236,8 +9236,8 @@
if (id->flag & LIB_READ) {
BLI_remlink(lbarray[a], id);
BKE_reportf_wrap(basefd->reports, RPT_ERROR,
- "LIB ERROR: %s:'%s' unread libblock missing from '%s'\n",
- BKE_idcode_to_name(GS(id->name)), id->name+2, mainptr->curlib->filepath);
+ "LIB ERROR: %s:'%s' unread libblock missing from '%s'",
+ BKE_idcode_to_name(GS(id->name)), id->name + 2, mainptr->curlib->filepath);
change_idid_adr(mainlist, basefd, id, NULL);
MEM_freeN(id);
Property changes on: branches/soc-2011-tomato/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-46714
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers/source/blender/editors/interface/interface.c:38694-39989
/trunk/blender/source/blender/editors/interface/interface.c:36831-46724
Modified: branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c 2012-05-19 10:10:49 UTC (rev 46793)
+++ branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c 2012-05-19 11:11:00 UTC (rev 46794)
@@ -834,8 +834,13 @@
static EnumPropertyItem *select_similar_type_itemf(bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop),
int *free)
{
- Object *obedit = CTX_data_edit_object(C);
+ Object *obedit;
+ if (!C) /* needed for docs and i18n tools */
+ return prop_similar_types;
+
+ obedit = CTX_data_edit_object(C);
+
if (obedit && obedit->type == OB_MESH) {
EnumPropertyItem *item = NULL;
int a, totitem = 0;
@@ -862,7 +867,7 @@
return item;
}
-
+
return NULL;
}
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c 2012-05-19 10:10:49 UTC (rev 46793)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c 2012-05-19 11:11:00 UTC (rev 46794)
@@ -356,8 +356,15 @@
bActionConstraint *data = curcon->data;
/* validate action */
- if (data->act == NULL)
+ if (data->act == NULL) {
+ /* must have action */
curcon->flag |= CONSTRAINT_DISABLE;
+ }
+ else if (data->act->idroot != ID_OB) {
+ /* only object-rooted actions can be used */
+ data->act = NULL;
+ curcon->flag |= CONSTRAINT_DISABLE;
+ }
}
else if (curcon->type == CONSTRAINT_TYPE_FOLLOWPATH) {
bFollowPathConstraint *data = curcon->data;
@@ -409,12 +416,12 @@
if (data->clip != NULL && data->track[0]) {
MovieTracking *tracking = &data->clip->tracking;
MovieTrackingObject *tracking_object;
-
+
if (data->object[0])
tracking_object = BKE_tracking_named_object(tracking, data->object);
else
tracking_object = BKE_tracking_get_camera_object(tracking);
-
+
if (!tracking_object) {
curcon->flag |= CONSTRAINT_DISABLE;
}
@@ -428,14 +435,14 @@
}
else if (curcon->type == CONSTRAINT_TYPE_CAMERASOLVER) {
bCameraSolverConstraint *data = curcon->data;
-
- if ((data->flag & CAMERASOLVER_ACTIVECLIP) == 0 && data->clip == NULL)
+
+ if ((data->flag & CAMERASOLVER_ACTIVECLIP) == 0 && (data->clip == NULL))
curcon->flag |= CONSTRAINT_DISABLE;
}
else if (curcon->type == CONSTRAINT_TYPE_OBJECTSOLVER) {
bObjectSolverConstraint *data = curcon->data;
-
- if ((data->flag & CAMERASOLVER_ACTIVECLIP) == 0 && data->clip == NULL)
+
+ if ((data->flag & CAMERASOLVER_ACTIVECLIP) == 0 && (data->clip == NULL))
curcon->flag |= CONSTRAINT_DISABLE;
}
Modified: branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c 2012-05-19 10:10:49 UTC (rev 46793)
+++ branches/soc-2011-tomato/source/blender/editors/space_file/file_ops.c 2012-05-19 11:11:00 UTC (rev 46794)
@@ -1099,7 +1099,11 @@
SpaceFile *sfile= CTX_wm_space_file(C);
if (sfile->params) {
- if ( sfile->params->dir[0] == '~' ) {
+ /* TODO, what about // when relbase isn't valid? */
+ if (G.relbase_valid && strncmp(sfile->params->dir, "//", 2) == 0) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list