[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27920] branches/render25: svn merge https ://svn.blender.org/svnroot/bf-blender/trunk/blender -r27889:27919
Campbell Barton
ideasman42 at gmail.com
Thu Apr 1 10:40:02 CEST 2010
Revision: 27920
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27920
Author: campbellbarton
Date: 2010-04-01 10:40:02 +0200 (Thu, 01 Apr 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r27889:27919
Modified Paths:
--------------
branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/render25/release/scripts/keyingsets/keyingsets_utils.py
branches/render25/release/scripts/ui/properties_scene.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/source/blender/blenkernel/BKE_action.h
branches/render25/source/blender/blenkernel/BKE_nla.h
branches/render25/source/blender/blenkernel/intern/action.c
branches/render25/source/blender/blenkernel/intern/nla.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenlib/BLI_blenlib.h
branches/render25/source/blender/blenlib/BLI_listbase.h
branches/render25/source/blender/blenlib/intern/path_util.c
branches/render25/source/blender/collada/DocumentImporter.cpp
branches/render25/source/blender/editors/animation/keyframing.c
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/interface/resources.c
branches/render25/source/blender/editors/mesh/editmesh_mods.c
branches/render25/source/blender/editors/render/render_preview.c
branches/render25/source/blender/editors/space_nla/nla_edit.c
branches/render25/source/blender/editors/space_sequencer/sequencer_draw.c
branches/render25/source/blender/editors/space_text/text_ops.c
branches/render25/source/blender/makesrna/intern/rna_action.c
branches/render25/source/blender/makesrna/intern/rna_fcurve.c
branches/render25/source/blender/makesrna/intern/rna_userdef.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/render25/source/blender/windowmanager/intern/wm_dragdrop.c
branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/render25/source/gameengine/Ketsji/KX_GameObject.cpp
Removed Paths:
-------------
branches/render25/source/blender/blenlib/BLI_dynamiclist.h
branches/render25/source/blender/blenlib/intern/dynamiclist.c
Modified: branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj 2010-04-01 08:39:08 UTC (rev 27919)
+++ branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj 2010-04-01 08:40:02 UTC (rev 27920)
@@ -532,10 +532,6 @@
>
</File>
<File
- RelativePath="..\..\..\source\blender\blenlib\intern\dynamiclist.c"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\blenlib\intern\dynlib.c"
>
</File>
@@ -689,10 +685,6 @@
>
</File>
<File
- RelativePath="..\..\..\source\blender\blenlib\BLI_dynamiclist.h"
- >
- </File>
- <File
RelativePath="..\..\..\source\blender\blenlib\BLI_edgehash.h"
>
</File>
@@ -777,6 +769,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\BLI_path_util.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\BLI_pbvh.h"
>
</File>
Modified: branches/render25/release/scripts/keyingsets/keyingsets_utils.py
===================================================================
--- branches/render25/release/scripts/keyingsets/keyingsets_utils.py 2010-04-01 08:39:08 UTC (rev 27919)
+++ branches/render25/release/scripts/keyingsets/keyingsets_utils.py 2010-04-01 08:40:02 UTC (rev 27920)
@@ -81,7 +81,7 @@
path = ""
# data on ID-blocks directly should get grouped by the KeyingSet
- grouping = None;
+ grouping = None
else:
# get the path to the ID-block
path = data.path_to_id()
Modified: branches/render25/release/scripts/ui/properties_scene.py
===================================================================
--- branches/render25/release/scripts/ui/properties_scene.py 2010-04-01 08:39:08 UTC (rev 27919)
+++ branches/render25/release/scripts/ui/properties_scene.py 2010-04-01 08:40:02 UTC (rev 27920)
@@ -89,6 +89,7 @@
row = layout.row()
col = row.column()
+ # XXX: this fails because index is not what this expects...
col.template_list(scene, "keying_sets", scene, "active_keying_set_index", rows=2)
col = row.column(align=True)
@@ -96,7 +97,7 @@
col.operator("anim.keying_set_remove", icon='ZOOMOUT', text="")
ks = scene.active_keying_set
- if ks:
+ if ks and ks.absolute:
row = layout.row()
col = row.column()
@@ -310,8 +311,10 @@
f.write("%s, '%s'" % (id_bpy_path, ksp.data_path))
# array index settings (if applicable)
- if ksp.entire_array is False:
- f.write(", entire_array=False, array_index=%d" % ksp.array_index)
+ if ksp.entire_array:
+ f.write(", index=-1")
+ else:
+ f.write(", index=%d" % ksp.array_index)
# grouping settings (if applicable)
# NOTE: the current default is KEYINGSET, but if this changes, change this code too
Modified: branches/render25/release/scripts/ui/space_userpref.py
===================================================================
--- branches/render25/release/scripts/ui/space_userpref.py 2010-04-01 08:39:08 UTC (rev 27919)
+++ branches/render25/release/scripts/ui/space_userpref.py 2010-04-01 08:40:02 UTC (rev 27920)
@@ -1280,8 +1280,8 @@
sub.row().prop(inputs, "view_rotation", expand=True)
sub.label(text="Zoom Style:")
- sub.row().prop(inputs, "viewport_zoom_style", expand=True)
- if inputs.viewport_zoom_style == 'DOLLY':
+ sub.row().prop(inputs, "zoom_style", text="")
+ if inputs.zoom_style == 'DOLLY':
sub.row().prop(inputs, "zoom_axis", expand=True)
sub.prop(inputs, "invert_zoom_direction")
@@ -1294,11 +1294,12 @@
#sub.prop(view, "wheel_scroll_lines", text="Scroll Lines")
col.separator()
-
+ ''' not implemented yet
sub = col.column()
sub.label(text="NDOF Device:")
sub.prop(inputs, "ndof_pan_speed", text="Pan Speed")
sub.prop(inputs, "ndof_rotate_speed", text="Orbit Speed")
+ '''
row.separator()
Modified: branches/render25/source/blender/blenkernel/BKE_action.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_action.h 2010-04-01 08:39:08 UTC (rev 27919)
+++ branches/render25/source/blender/blenkernel/BKE_action.h 2010-04-01 08:40:02 UTC (rev 27920)
@@ -105,6 +105,9 @@
/* Make the given Action Group the active one */
void set_active_action_group(struct bAction *act, struct bActionGroup *agrp, short select);
+/* Add a new action group with the given name to the action */
+struct bActionGroup *action_groups_add_new(struct bAction *act, const char name[]);
+
/* Add given channel into (active) group */
void action_groups_add_channel(struct bAction *act, struct bActionGroup *agrp, struct FCurve *fcurve);
Modified: branches/render25/source/blender/blenkernel/BKE_nla.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_nla.h 2010-04-01 08:39:08 UTC (rev 27919)
+++ branches/render25/source/blender/blenkernel/BKE_nla.h 2010-04-01 08:40:02 UTC (rev 27920)
@@ -77,6 +77,8 @@
short BKE_nlatrack_add_strip(struct NlaTrack *nlt, struct NlaStrip *strip);
+short BKE_nlatrack_get_bounds(struct NlaTrack *nlt, float bounds[2]);
+
/* ............ */
struct NlaStrip *BKE_nlastrip_find_active(struct NlaTrack *nlt);
Modified: branches/render25/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/action.c 2010-04-01 08:39:08 UTC (rev 27919)
+++ branches/render25/source/blender/blenkernel/intern/action.c 2010-04-01 08:40:02 UTC (rev 27920)
@@ -238,6 +238,30 @@
}
}
+/* Add a new action group with the given name to the action */
+bActionGroup *action_groups_add_new (bAction *act, const char name[])
+{
+ bActionGroup *agrp;
+
+ /* sanity check: must have action and name */
+ if (ELEM(NULL, act, name))
+ return NULL;
+
+ /* allocate a new one */
+ agrp = MEM_callocN(sizeof(bActionGroup), "bActionGroup");
+
+ /* make it selected, with default name */
+ agrp->flag = AGRP_SELECTED;
+ strncpy(agrp->name, name[0] ? name : "Group", sizeof(agrp->name));
+
+ /* add to action, and validate */
+ BLI_addtail(&act->groups, agrp);
+ BLI_uniquename(&act->groups, agrp, "Group", '.', offsetof(bActionGroup, name), sizeof(agrp->name));
+
+ /* return the new group */
+ return agrp;
+}
+
/* Add given channel into (active) group
* - assumes that channel is not linked to anything anymore
* - always adds at the end of the group
Modified: branches/render25/source/blender/blenkernel/intern/nla.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/nla.c 2010-04-01 08:39:08 UTC (rev 27919)
+++ branches/render25/source/blender/blenkernel/intern/nla.c 2010-04-01 08:40:02 UTC (rev 27920)
@@ -39,10 +39,12 @@
#include "BLI_ghash.h"
#include "DNA_anim_types.h"
+#include "DNA_scene_types.h"
#include "BKE_action.h"
#include "BKE_fcurve.h"
#include "BKE_nla.h"
+#include "BKE_global.h"
#include "BKE_library.h"
#include "BKE_utildefines.h"
@@ -956,6 +958,35 @@
return BKE_nlastrips_add_strip(&nlt->strips, strip);
}
+/* Get the extents of the given NLA-Track including gaps between strips,
+ * returning whether this succeeded or not
+ */
+short BKE_nlatrack_get_bounds (NlaTrack *nlt, float bounds[2])
+{
+ NlaStrip *strip;
+
+ /* initialise bounds */
+ if (bounds)
+ bounds[0] = bounds[1] = 0.0f;
+ else
+ return 0;
+
+ /* sanity checks */
+ if ELEM(NULL, nlt, nlt->strips.first)
+ return 0;
+
+ /* lower bound is first strip's start frame */
+ strip = nlt->strips.first;
+ bounds[0] = strip->start;
+
+ /* upper bound is last strip's end frame */
+ strip = nlt->strips.last;
+ bounds[1] = strip->end;
+
+ /* done */
+ return 1;
+}
+
/* NLA Strips -------------------------------------- */
/* Find the active NLA-strip within the given track */
@@ -1474,7 +1505,10 @@
}
}
if ELEM3(NULL, activeTrack, activeStrip, activeStrip->act) {
- printf("NLA tweakmode enter - neither active requirement found \n");
+ if (G.f & G_DEBUG) {
+ printf("NLA tweakmode enter - neither active requirement found \n");
+ printf("\tactiveTrack = %p, activeStrip = %p \n", activeTrack, activeStrip);
+ }
return 0;
}
@@ -1553,4 +1587,29 @@
adt->flag &= ~ADT_NLA_EDIT_ON;
}
+/* Baking Tools ------------------------------------------- */
+
+void BKE_nla_bake (Scene *scene, ID *id, AnimData *adt, int flag)
+{
+
+ /* verify that data is valid
+ * 1) Scene and AnimData must be provided
+ * 2) there must be tracks to merge...
+ */
+ if ELEM3(NULL, scene, adt, adt->nla_tracks.first)
+ return;
+
+ /* if animdata currently has an action, 'push down' this onto the stack first */
+ if (adt->action)
+ BKE_nla_action_pushdown(adt);
+
+ /* get range of motion to bake, and the channels involved... */
+
+ /* temporarily mute the action, and start keying to it */
+
+ /* start keying... */
+
+ /* unmute the action */
+}
+
/* *************************************************** */
Modified: branches/render25/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/sequencer.c 2010-04-01 08:39:08 UTC (rev 27919)
+++ branches/render25/source/blender/blenkernel/intern/sequencer.c 2010-04-01 08:40:02 UTC (rev 27920)
@@ -1750,19 +1750,15 @@
if(seq->flag & SEQ_MAKE_FLOAT) {
if (!se->ibuf->rect_float) {
- if (scene->r.color_mgt_flag & R_COLOR_MANAGEMENT) {
- IMB_float_from_rect(se->ibuf);
- } else {
- int profile = IB_PROFILE_NONE;
-
- /* no color management:
- * don't disturb the existing profiles */
- SWAP(int, se->ibuf->profile, profile);
+ int profile = IB_PROFILE_NONE;
+
+ /* no color management:
+ * don't disturb the existing profiles */
+ SWAP(int, se->ibuf->profile, profile);
- IMB_float_from_rect(se->ibuf);
-
- SWAP(int, se->ibuf->profile, profile);
- }
+ IMB_float_from_rect(se->ibuf);
+
+ SWAP(int, se->ibuf->profile, profile);
}
if (se->ibuf->rect) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list