[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18953] branches/blender2.5/blender/source /blender: Animato: Various improvements
Revision: 18953
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18953
Author: aligorith
Date: 2009-02-13 07:33:07 +0100 (Fri, 13 Feb 2009)
Log Message:
---
Animato: Various improvements
* Scene and World AnimDatas are now included in animation editors
* Keyframes for integer-value settings now get the FCURVE_INT_VALUES flag set
for their F-Curves, which restricts those curves to only having integer-values.
F-Curve displays have been altered accordingly, but some editing tools may
still need tweaks to work with this.
* Fixed notifiers for Insert Keyframe -> Active Keying Set.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
branches/blender2.5/blender/source/blender/editors/animation/keyframes_draw.c
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/include/ED_anim_api.h
branches/blender2.5/blender/source/blender/editors/include/ED_keyframes_draw.h
branches/blender2.5/blender/source/blender/editors/space_action/action_draw.c
branches/blender2.5/blender/source/blender/editors/space_action/action_header.c
branches/blender2.5/blender/source/blender/editors/space_action/action_select.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_header.c
branches/blender2.5/blender/source/blender/editors/space_graph/space_graph.c
branches/blender2.5/blender/source/blender/makesdna/DNA_action_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_world_types.h
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
===
---
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
2009-02-13 06:24:15 UTC (rev 18952)
+++
branches/blender2.5/blender/source/blender/editors/animation/anim_channels.c
2009-02-13 06:33:07 UTC (rev 18953)
@@ -58,6 +58,7 @@
#include "DNA_userdef_types.h"
#include "DNA_gpencil_types.h"
#include "DNA_windowmanager_types.h"
+#include "DNA_world_types.h"
#include "RNA_access.h"
#include "RNA_define.h"
@@ -164,6 +165,10 @@
break;
switch (ale->type) {
+ case ANIMTYPE_SCENE:
+ if (ale->flag & SCE_DS_SELECTED)
+ sel= ACHANNEL_SETFLAG_CLEAR;
+ break;
case ANIMTYPE_OBJECT:
if (ale->flag & SELECT)
sel= ACHANNEL_SETFLAG_CLEAR;
@@ -187,6 +192,13 @@
/* Now set the flags */
for (ale= anim_data.first; ale; ale= ale->next) {
switch (ale->type) {
+ case ANIMTYPE_SCENE:
+ {
+ Scene *scene= (Scene *)ale->data;
+
+ ACHANNEL_SET_FLAG(scene, sel, SCE_DS_SELECTED);
+ }
+ break;
case ANIMTYPE_OBJECT:
{
Base *base= (Base *)ale->data;
@@ -1046,6 +1058,26 @@
/* action to take depends on what channel we've got */
switch (ale->type) {
+ case ANIMTYPE_SCENE:
+ {
+ Scene *sce= (Scene *)ale->data;
+
+ if (x < 16) {
+ /* toggle expand */
+ sce->flag ^= SCE_DS_COLLAPSED;
+ }
+ else {
+ /* set selection status */
+ if (selectmode == SELECT_INVERT) {
+ /* swap select */
+ sce->flag ^= SCE_DS_SELECTED;
+ }
+ else {
+ sce->flag |= SCE_DS_SELECTED;
+ }
+ }
+ }
+ break;
case ANIMTYPE_OBJECT:
{
bDopeSheet *ads= (bDopeSheet *)ac->data;
@@ -1132,6 +1164,12 @@
key->flag ^= KEYBLOCK_DS_EXPAND;
}
break;
+ case ANIMTYPE_DSWOR:
+ {
+ World *wo= (World *)
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18952] trunk/blender/source/blender/src/ sequence.c: [#18209] 3 VSE crash bugs with .blends ( all left click and move mouse over Metastrip/Blend Mode
Revision: 18952
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18952
Author: campbellbarton
Date: 2009-02-13 07:24:15 +0100 (Fri, 13 Feb 2009)
Log Message:
---
[#18209] 3 VSE crash bugs with .blends (all left click and move mouse over
Metastrip/Blend Mode related)
Workaround for a bug where dragging the playhead over a metastrip with blending
on it could segfault blender.
Tried to figure out why the imbuf rect is not set, but for now a NULL check
stops the crash.
Modified Paths:
--
trunk/blender/source/blender/src/sequence.c
Modified: trunk/blender/source/blender/src/sequence.c
===
--- trunk/blender/source/blender/src/sequence.c 2009-02-13 03:49:53 UTC (rev
18951)
+++ trunk/blender/source/blender/src/sequence.c 2009-02-13 06:24:15 UTC (rev
18952)
@@ -2111,6 +2111,14 @@
}
}
+/* Bug: 18209
+ * when dragging the mouse over a metastrip, on mouse-up for some unknown
+ * reason in some cases the metastrips TStripElem->ibuf->rect is NULL,
+ * This should be fixed but I had a look and couldnt work out why its
+ * happening so for now workaround with a NULL check - campbell */
+
+#define SEQ_SPECIAL_SEQ_UPDATE_WORKAROUND
+
static TStripElem* do_build_seq_array_recursively(
ListBase *seqbasep, int cfra, int chanshown)
{
@@ -2277,7 +2285,14 @@
!se2->ibuf_comp->rect_float) {
IMB_rect_from_float(se2->ibuf);
}
-
+
+#ifdef SEQ_SPECIAL_SEQ_UPDATE_WORKAROUND
+ if (se2->ibuf->rect==NULL &&
se2->ibuf->rect_float==NULL) {
+ printf("ERROR: sequencer se2->ibuf missing
buffer\n");
+ } else if (se1->ibuf->rect==NULL &&
se1->ibuf->rect_float==NULL) {
+ printf("ERROR: sequencer se1->ibuf missing
buffer\n");
+ } else {
+#endif
/* bad hack, to fix crazy input ordering of
those two effects */
@@ -2299,6 +2314,10 @@
se2->ibuf_comp);
}
+#ifdef SEQ_SPECIAL_SEQ_UPDATE_WORKAROUND
+ }
+#endif
+
IMB_cache_limiter_insert(se2->ibuf_comp);
IMB_cache_limiter_ref(se2->ibuf_comp);
IMB_cache_limiter_touch(se2->ibuf_comp);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18951] branches/bmesh/blender/source/ blender/bmesh/operators/triangulateop.c: missing free
Revision: 18951 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18951 Author: joeedh Date: 2009-02-13 04:49:53 +0100 (Fri, 13 Feb 2009) Log Message: --- missing free Modified Paths: -- branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c Modified: branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c === --- branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c 2009-02-13 03:27:03 UTC (rev 18950) +++ branches/bmesh/blender/source/blender/bmesh/operators/triangulateop.c 2009-02-13 03:49:53 UTC (rev 18951) @@ -40,4 +40,6 @@ BMO_Flag_To_Slot(bmesh, op, BMOP_TRIANG_NEW_EDGES, EDGE_NEW, BM_EDGE); BMO_Flag_To_Slot(bmesh, op, BMOP_TRIANG_NEW_FACES, FACE_NEW, BM_FACE); + + V_FREE(projectverts); } \ No newline at end of file ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18950] branches/bmesh/blender: merge with 2.5 at r18948
Revision: 18950 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18950 Author: joeedh Date: 2009-02-13 04:27:03 +0100 (Fri, 13 Feb 2009) Log Message: --- merge with 2.5 at r18948 Modified Paths: -- branches/bmesh/blender/extern/libopenjpeg/opj_malloc.h branches/bmesh/blender/release/datafiles/blenderbuttons branches/bmesh/blender/source/blender/blenfont/BLF_api.h branches/bmesh/blender/source/blender/blenfont/intern/blf_internal_types.h branches/bmesh/blender/source/blender/blenkernel/BKE_action.h branches/bmesh/blender/source/blender/blenkernel/BKE_animsys.h branches/bmesh/blender/source/blender/blenkernel/BKE_fcurve.h branches/bmesh/blender/source/blender/blenkernel/intern/action.c branches/bmesh/blender/source/blender/blenkernel/intern/anim_sys.c branches/bmesh/blender/source/blender/blenkernel/intern/armature.c branches/bmesh/blender/source/blender/blenkernel/intern/blender.c branches/bmesh/blender/source/blender/blenkernel/intern/curve.c branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c branches/bmesh/blender/source/blender/blenkernel/intern/node.c branches/bmesh/blender/source/blender/blenkernel/intern/object.c branches/bmesh/blender/source/blender/blenkernel/intern/scene.c branches/bmesh/blender/source/blender/blenlib/BLI_listbase.h branches/bmesh/blender/source/blender/blenlib/BLI_noise.h branches/bmesh/blender/source/blender/blenlib/BLI_rect.h branches/bmesh/blender/source/blender/blenlib/BLI_string.h branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c branches/bmesh/blender/source/blender/blenlib/intern/arithb.c branches/bmesh/blender/source/blender/blenlib/intern/dynamiclist.c branches/bmesh/blender/source/blender/blenlib/intern/dynamiclist.h branches/bmesh/blender/source/blender/blenlib/intern/listbase.c branches/bmesh/blender/source/blender/blenlib/intern/rct.c branches/bmesh/blender/source/blender/blenlib/intern/string.c branches/bmesh/blender/source/blender/blenloader/intern/readfile.c branches/bmesh/blender/source/blender/blenloader/intern/writefile.c branches/bmesh/blender/source/blender/editors/animation/anim_channels.c branches/bmesh/blender/source/blender/editors/animation/anim_filter.c branches/bmesh/blender/source/blender/editors/animation/anim_ops.c branches/bmesh/blender/source/blender/editors/animation/keyframes_edit.c branches/bmesh/blender/source/blender/editors/animation/keyframes_general.c branches/bmesh/blender/source/blender/editors/animation/keyframing.c branches/bmesh/blender/source/blender/editors/armature/armature_intern.h branches/bmesh/blender/source/blender/editors/armature/armature_ops.c branches/bmesh/blender/source/blender/editors/armature/editarmature.c branches/bmesh/blender/source/blender/editors/curve/curve_intern.h branches/bmesh/blender/source/blender/editors/curve/curve_ops.c branches/bmesh/blender/source/blender/editors/curve/editcurve.c branches/bmesh/blender/source/blender/editors/datafiles/blenderbuttons.c branches/bmesh/blender/source/blender/editors/include/ED_armature.h branches/bmesh/blender/source/blender/editors/include/ED_curve.h branches/bmesh/blender/source/blender/editors/include/ED_image.h branches/bmesh/blender/source/blender/editors/include/ED_keyframes_draw.h branches/bmesh/blender/source/blender/editors/include/ED_keyframes_edit.h branches/bmesh/blender/source/blender/editors/include/ED_keyframing.h branches/bmesh/blender/source/blender/editors/include/ED_mesh.h branches/bmesh/blender/source/blender/editors/include/ED_screen.h branches/bmesh/blender/source/blender/editors/include/ED_uvedit.h branches/bmesh/blender/source/blender/editors/include/UI_interface.h branches/bmesh/blender/source/blender/editors/include/UI_resources.h branches/bmesh/blender/source/blender/editors/include/UI_view2d.h branches/bmesh/blender/source/blender/editors/interface/interface.c branches/bmesh/blender/source/blender/editors/interface/interface_draw.c branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c branches/bmesh/blender/source/blender/editors/interface/interface_icons.c branches/bmesh/blender/source/blender/editors/interface/interface_intern.h branches/bmesh/blender/source/blender/editors/interface/interface_panel.c branches/bmesh/blender/source/blender/editors/interface/interface_regions.c branches/bmesh/blender/source/blender/editors/interface/interface_utils.c branches/bmesh/blender/source/blender/editors/interface/resources.c branches/bmesh/blender/source/blender/editors/interface/view2d.c branches/bmesh/blender/source/blender/editors/interface/view2d_ops.c branches/bmesh/blender/source/blender
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18949] branches/blender2.5/blender/source /blender: Keying Sets: Wrapped KeyingSets in RNA
Revision: 18949
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18949
Author: aligorith
Date: 2009-02-13 02:51:33 +0100 (Fri, 13 Feb 2009)
Log Message:
---
Keying Sets: Wrapped KeyingSets in RNA
* The settings of KeyingSets can now be viewed/modified through RNA.
* Shuffled RNA wrapping for AnimData over to its own file
* Moved insert-key flags to DNA_anim_types.h, as they're now used for
KeyingSets.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_animsys.h
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/include/ED_keyframing.h
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/makesdna/DNA_anim_types.h
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
Added Paths:
---
branches/blender2.5/blender/source/blender/makesrna/intern/rna_animation.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_animsys.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_animsys.h
2009-02-12 23:25:36 UTC (rev 18948)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_animsys.h
2009-02-13 01:51:33 UTC (rev 18949)
@@ -33,7 +33,7 @@
struct KeyingSet *BKE_keyingset_add(struct ListBase *list, const char name[],
short flag, short keyingflag);
/* Add a destination to a KeyingSet */
-void BKE_keyingset_add_destination(struct KeyingSet *ks, struct ID *id, const
char group_name[], const char rna_path[], int array_index, int flag);
+void BKE_keyingset_add_destination(struct KeyingSet *ks, struct ID *id, const
char group_name[], const char rna_path[], int array_index, short flag, short
groupmode);
/* Free data for KeyingSet but not set itself */
void BKE_keyingset_free(struct KeyingSet *ks);
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
2009-02-12 23:25:36 UTC (rev 18948)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
2009-02-13 01:51:33 UTC (rev 18949)
@@ -195,7 +195,7 @@
/* Add a destination to a KeyingSet. Nothing is returned for now...
* Checks are performed to ensure that destination is appropriate for the
KeyingSet in question
*/
-void BKE_keyingset_add_destination (KeyingSet *ks, ID *id, const char
group_name[], const char rna_path[], int array_index, int flag)
+void BKE_keyingset_add_destination (KeyingSet *ks, ID *id, const char
group_name[], const char rna_path[], int array_index, short flag, short
groupmode)
{
KS_Path *ksp;
@@ -229,6 +229,7 @@
/* store flags */
ksp->flag= flag;
+ ksp->groupmode= groupmode;
/* add KeyingSet path to KeyingSet */
BLI_addtail(&ks->paths, ksp);
Modified:
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
===
--- branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
2009-02-12 23:25:36 UTC (rev 18948)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
2009-02-13 01:51:33 UTC (rev 18949)
@@ -2031,9 +2031,9 @@
int arraylen, i;
/* get pointer to name of group to add channels to */
- if (ksp->flag & KSP_FLAG_GROUP_NONE)
+ if (ksp->groupmode == KSP_GROUP_NONE)
groupname= NULL;
- else if (ksp->flag & KSP_FLAG_GROUP_KSNAME)
+ else if (ksp->groupmode == KSP_GROUP_KSNAME)
groupname= ks->name;
else
groupname= ksp->group;
Modified:
branches/blender2.5/blender/source/blender/editors/include/ED_keyframing.h
===
--- branches/blender2.5/blender/source/blender/editors/include/ED_keyframing.h
2009-02-12 23:25:36 UTC (rev 18948)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_keyframing.h
2009-02-13 01:51:33 UTC (rev 18949)
@@ -52,23 +52,6 @@
*/
void insert_vert_fcurve(struct FCurve *fcu, float x, float y, short flag)
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18948] branches/blender2.5/blender/source /blender/blenkernel/intern/anim_sys.c: KeyingSets: Fixing crash when adding KeyingSets and no group name is
Revision: 18948
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18948
Author: aligorith
Date: 2009-02-13 00:25:36 +0100 (Fri, 13 Feb 2009)
Log Message:
---
KeyingSets: Fixing crash when adding KeyingSets and no group name is supplied
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
2009-02-12 22:24:51 UTC (rev 18947)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
2009-02-12 23:25:36 UTC (rev 18948)
@@ -177,7 +177,10 @@
/* allocate new KeyingSet */
ks= MEM_callocN(sizeof(KeyingSet), "KeyingSet");
- BLI_snprintf(ks->name, 64, name);
+ if (name)
+ BLI_snprintf(ks->name, 64, name);
+ else
+ strcpy(ks->name, "Keying Set");
ks->flag= flag;
ks->keyingflag= keyingflag;
@@ -212,7 +215,10 @@
/* just store absolute info */
if (ks->flag & KEYINGSET_ABSOLUTE) {
ksp->id= id;
- BLI_snprintf(ksp->group, 64, group_name);
+ if (group_name)
+ BLI_snprintf(ksp->group, 64, group_name);
+ else
+ strcpy(ksp->group, "");
}
/* just copy path info */
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18947] branches/blender2.5/blender/source /blender/editors/uvedit/uvedit_unwrap_ops.c: Compilation fix: added missing ;
Revision: 18947
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18947
Author: aligorith
Date: 2009-02-12 23:24:51 +0100 (Thu, 12 Feb 2009)
Log Message:
---
Compilation fix: added missing ;
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
Modified:
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
===
---
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2009-02-12 22:12:21 UTC (rev 18946)
+++
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
2009-02-12 22:24:51 UTC (rev 18947)
@@ -933,7 +933,7 @@
static int from_view_poll(bContext *C)
{
- RegionView3D *rv3d= CTX_wm_region_view3d(C)
+ RegionView3D *rv3d= CTX_wm_region_view3d(C);
if(!ED_operator_uvmap(C))
return 0;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18946] branches/blender2.5/blender/source /blender: 2.5: Most curve/surface editmode operators back:
Revision: 18946 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18946 Author: blendix Date: 2009-02-12 23:12:21 +0100 (Thu, 12 Feb 2009) Log Message: --- 2.5: Most curve/surface editmode operators back: * Hide, Reveal * Separate, Duplicate, Delete * Set Weight, Set Radius, Set Spline Type, Set Handle Type, Set Smooth * Tilt, Clear Tilt * Smooth, Smooth Radius * De(select) First, De(select) Last, De(select) All, Select Inverse, Select Linked, Select Control Point Row, Select Next, Select Previous, Select More, Select Less, Select Random, Select Every Nth * Switch Direction, Subdivide, Make Segment, Spin, Extrude, Toggle Cyclic * Specials Menu Not working correct yet: * Add Vertex (ctrl click) * Add Menu Modified Paths: -- branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c branches/blender2.5/blender/source/blender/editors/curve/editcurve.c branches/blender2.5/blender/source/blender/editors/include/ED_curve.h branches/blender2.5/blender/source/blender/editors/include/ED_screen.h branches/blender2.5/blender/source/blender/editors/interface/interface.c branches/blender2.5/blender/source/blender/editors/object/object_edit.c branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c === --- branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c 2009-02-12 18:05:34 UTC (rev 18945) +++ branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c 2009-02-12 22:12:21 UTC (rev 18946) @@ -191,6 +191,8 @@ cun->bev.first= cun->bev.last= 0; cun->path= 0; + cun->editnurb= NULL; + #if 0 // XXX old animation system /* single user ipo too */ if(cun->ipo) cun->ipo= copy_ipo(cun->ipo); Modified: branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h === --- branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h 2009-02-12 18:05:34 UTC (rev 18945) +++ branches/blender2.5/blender/source/blender/editors/curve/curve_intern.h 2009-02-12 22:12:21 UTC (rev 18946) @@ -44,20 +44,21 @@ void CURVE_OT_set_weight(struct wmOperatorType *ot); void CURVE_OT_set_radius(struct wmOperatorType *ot); void CURVE_OT_smooth(struct wmOperatorType *ot); -void CURVE_OT_smooth_curve_radius(struct wmOperatorType *ot); +void CURVE_OT_smooth_radius(struct wmOperatorType *ot); void CURVE_OT_de_select_first(struct wmOperatorType *ot); void CURVE_OT_de_select_last(struct wmOperatorType *ot); void CURVE_OT_de_select_all(struct wmOperatorType *ot); void CURVE_OT_hide(struct wmOperatorType *ot); void CURVE_OT_reveal(struct wmOperatorType *ot); -void CURVE_OT_select_invert(struct wmOperatorType *ot); +void CURVE_OT_select_inverse(struct wmOperatorType *ot); void CURVE_OT_subdivide(struct wmOperatorType *ot); void CURVE_OT_set_spline_type(struct wmOperatorType *ot); +void CURVE_OT_set_handle_type(struct wmOperatorType *ot); void CURVE_OT_make_segment(struct wmOperatorType *ot); void CURVE_OT_spin(struct wmOperatorType *ot); void CURVE_OT_add_vertex(struct wmOperatorType *ot); void CURVE_OT_extrude(struct wmOperatorType *ot); -void CURVE_OT_make_cyclic(struct wmOperatorType *ot); +void CURVE_OT_toggle_cyclic(struct wmOperatorType *ot); void CURVE_OT_select_linked(struct wmOperatorType *ot); void CURVE_OT_select_row(struct wmOperatorType *ot); void CURVE_OT_select_next(struct wmOperatorType *ot); @@ -66,10 +67,16 @@ void CURVE_OT_select_less(struct wmOperatorType *ot); void CURVE_OT_select_random(struct wmOperatorType *ot); void CURVE_OT_select_every_nth(struct wmOperatorType *ot); -void CURVE_OT_add_duplicate(struct wmOperatorType *ot); +void CURVE_OT_duplicate(struct wmOperatorType *ot); void CURVE_OT_delete(struct wmOperatorType *ot); void CURVE_OT_set_smooth(struct wmOperatorType *ot); void CURVE_OT_clear_tilt(struct wmOperatorType *ot); +void CURVE_OT_add_surface_primitive(struct wmOperatorType *ot); +void CURVE_OT_add_curve_primitive(struct wmOperatorType *ot); +void CURVE_OT_specials_menu(struct wmOperatorType *ot); +void CURVE_OT_add_menu(struct wmOperatorType *ot); + + #endif /* ED_UTIL_INTERN_H */ Modified: branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c === --- branches/blender2.5/blender/source/blender/editors/curve/curve_ops.c 2009-02-12 18:05:34 UTC (re
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18945] branches/bmesh/blender/source/ blender: made extrude properly delete unneeded geometry
Revision: 18945
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18945
Author: joeedh
Date: 2009-02-12 19:05:34 +0100 (Thu, 12 Feb 2009)
Log Message:
---
made extrude properly delete unneeded geometry
Modified Paths:
--
branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
Modified: branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
===
--- branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
2009-02-12 16:59:51 UTC (rev 18944)
+++ branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
2009-02-12 18:05:34 UTC (rev 18945)
@@ -33,6 +33,7 @@
#include "MEM_guardedalloc.h"
#include "BLI_ghash.h"
+#include "BLI_mempool.h"
#include "BLO_sys_types.h" // for intptr_t support
@@ -63,6 +64,7 @@
GHashCmpFP cmpfp;
Entry **buckets;
+ struct BLI_mempool *entrypool;
int nbuckets, nentries, cursize;
};
@@ -72,7 +74,8 @@
GHash *gh= MEM_mallocN(sizeof(*gh), "GHash");
gh->hashfp= hashfp;
gh->cmpfp= cmpfp;
-
+ gh->entrypool = BLI_mempool_create(sizeof(Entry), 1, 32);
+
gh->cursize= 0;
gh->nentries= 0;
gh->nbuckets= hashsizes[gh->cursize];
@@ -85,7 +88,7 @@
void BLI_ghash_insert(GHash *gh, void *key, void *val) {
unsigned int hash= gh->hashfp(key)%gh->nbuckets;
- Entry *e= malloc(sizeof(*e));
+ Entry *e= BLI_mempool_alloc(gh->entrypool);
e->key= key;
e->val= val;
@@ -141,7 +144,7 @@
if (keyfreefp) keyfreefp(e->key);
if (valfreefp) valfreefp(e->val);
- free(e);
+ BLI_mempool_free(gh->entrypool, e);
e= n;
@@ -185,13 +188,14 @@
if (keyfreefp) keyfreefp(e->key);
if (valfreefp) valfreefp(e->val);
- free(e);
+ BLI_mempool_free(gh->entrypool, e);
e= n;
}
}
free(gh->buckets);
+ BLI_mempool_destroy(gh->entrypool);
gh->buckets = 0;
gh->nentries = 0;
gh->nbuckets = 0;
Modified: branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
===
--- branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
2009-02-12 16:59:51 UTC (rev 18944)
+++ branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c
2009-02-12 18:05:34 UTC (rev 18945)
@@ -65,7 +65,8 @@
pool->chunks.first = pool->chunks.last = NULL;
maxchunks = tote / pchunk;
-
+ if (maxchunks==0) maxchunks = 1;
+
/*allocate the actual chunks*/
for(i=0; i < maxchunks; i++){
BLI_mempool_chunk *mpchunk =
MEM_mallocN(sizeof(BLI_mempool_chunk), "BLI_Mempool Chunk");
@@ -85,6 +86,7 @@
/*set the end of this chunks memoryy to the new tail for next
iteration*/
lasttail = curnode;
}
+
/*terminate the list*/
curnode->next = NULL;
return pool;
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
===
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
2009-02-12 16:59:51 UTC (rev 18944)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
2009-02-12 18:05:34 UTC (rev 18945)
@@ -180,6 +180,7 @@
#define DEL_EDGESFACES 4
#define DEL_FACES 5
#define DEL_ALL6
+#define DEL_ONLYTAGGED 7
/*BMOP_DEL_CONTEXT*/
enum {
Modified: branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
===
--- branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
2009-02-12 16:59:51 UTC (rev 18944)
+++ branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
2009-02-12 18:05:34 UTC (rev 18945)
@@ -339,22 +339,53 @@
BMOperator *splitop = op;
BMOperator dupeop;
BMOperator delop;
+ BMVert *v;
+ BMEdge *e;
+ BMFace *f;
+ BMIter iter, iter2;
+ int found;
/*initialize our sub-operators*/
BMO_Init_Op(&dupeop, BMOP_DUPE);
BMO_Init_Op(&delop, BMOP_DEL);
- BMO_Set_Int(&delop, BMOP_DEL_CONTEXT, DEL_FACES);
-
BMO_CopySlot(splitop, &dupe
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18944] branches/bmesh/blender/source/ blender: Replaced unified extrude edges/faces code ( the stuff specificaly for
Revision: 18944
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18944
Author: joeedh
Date: 2009-02-12 17:59:51 +0100 (Thu, 12 Feb 2009)
Log Message:
---
Replaced unified extrude edges/faces code (the stuff specificaly for
edges/faces,extrudeflag_edgess, not the entire extrude system) with
a bmesh version. This stress-tested the operator api, and I had to
code some new stuff,including:
* An api to iterate over Mapping slots and array slots. It's modeled
after the normal iterator api.
* The ability to copy mapping slots.
* More mapping functions.
* In addition to being able to flag elements in a buffer,
you can now unflag them (much clearer then passing in ~flag
I think).
The extrude edge/faces code has multiple layers. At the top
level is a funtion in editmesh_lib.c, which takes care of selection,
handles mirror modifiers, etc. It calls the extrude operator, which
in turns calls split, which calls dupe/del. Note that split needed
a slot to exclude things from being deleting (e.g. when extruding
a single isolated face).
The basic idea (reflected in original design of split/dupe/del by Briggs)
is to use the split function to do the heavy work of extrude. split spits
out new geometry and mappings from boundary edges, for extrude (it should
also spit out other mappings, but that's for later).
Briggs: you may want to look over this, hopefully I didn't do anything
too evil.
I probably should spend some time going over the 2.5 mesh operators and
cleaning them up, splitting ones that need splitting, etc, and in general
getting them to work properly.
Modified Paths:
--
branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_opdefines.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_operators_private.h
branches/bmesh/blender/source/blender/bmesh/operators/bmesh_dupeops.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_lib.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
Added Paths:
---
branches/bmesh/blender/source/blender/bmesh/operators/extrudeops.c
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
===
--- branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
2009-02-12 16:27:19 UTC (rev 18943)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
2009-02-12 16:59:51 UTC (rev 18944)
@@ -80,6 +80,7 @@
int BMO_CountFlag(struct BMesh *bm, int flag, int type);
void BMO_Flag_To_Slot(struct BMesh *bm, struct BMOperator *op, int slotcode,
int flag, int type);
void BMO_Flag_Buffer(struct BMesh *bm, struct BMOperator *op, int slotcode,
int flag);
+void BMO_Unflag_Buffer(struct BMesh *bm, struct BMOperator *op, int slotcode,
int flag);
void BMO_HeaderFlag_To_Slot(struct BMesh *bm, struct BMOperator *op, int
slotcode, int flag, int type);
int BMO_CountSlotBuf(struct BMesh *bm, struct BMOperator *op, int slotcode);
@@ -88,6 +89,9 @@
void *element, void *data, int len);
void BMO_Insert_MapFloat(BMesh *bm, BMOperator *op, int slotcode,
void *element, float val);
+
+//returns 1 if the specified element is in the map.
+int BMO_InMap(BMesh *bm, BMOperator *op, int slotcode, void *element);
void *BMO_Get_MapData(BMesh *bm, BMOperator *op, int slotcode,
void *element);
float BMO_Get_MapFloat(BMesh *bm, BMOperator *op, int slotcode,
@@ -102,6 +106,22 @@
void *BMO_Get_MapPointer(BMesh *bm, BMOperator *op, int slotcode,
void *element);
+struct GHashIterator;
+typedef struct BMOIter {
+ BMOpSlot *slot;
+ int cur; //for arrays
+ struct GHashIterator giter;
+ void *val;
+} BMOIter;
+
+void *BMO_IterNew(BMOIter *iter, BMesh *bm, BMOperator *op,
+ int slotcode);
+void *BMO_IterStep(BMOIter *iter);
+
+/*returns a pointer to the key value when iterating over mappings.
+ remember for pointer maps this will be a pointer to a pointer.*/
+void *BMO_IterMapVal(BMOIter *iter);
+
/*if msg is null, then the default message for the errorcode is used*/
void BMOP_RaiseError(BMesh *bm, int errcode, char *msg);
/*returns error code or 0 if no error*/
@@ -126,8 +146,9 @@
enum {
BMOP_SPLIT_MULTIN,
+ BMOP_SPLIT_KEEPIN, //input list of geometry to keep
BMOP_SPLIT_MULTOUT,
- BMOP_SPLIT_BOUNDS_EDGEMAP,
+ BMOP_SPLIT_BOUNDS_EDGEMAP, //bounding edges of split faces
BMOP_SPLIT_TOTSLOT,
};
@@ -236,8 +257,16 @@
#define BMOP_MAKE_FGONS9
#define BMOP_MAKE_FGONS_TOTSLOT0
+#de
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18943] trunk/blender/source/blender/ python/api2_2x/Modifier.c: add some more modifier types and access to shrink wrap target object ( but no other s
Revision: 18943
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18943
Author: campbellbarton
Date: 2009-02-12 17:27:19 +0100 (Thu, 12 Feb 2009)
Log Message:
---
add some more modifier types and access to shrink wrap target object (but no
other shrink wrap settings)
Modified Paths:
--
trunk/blender/source/blender/python/api2_2x/Modifier.c
Modified: trunk/blender/source/blender/python/api2_2x/Modifier.c
===
--- trunk/blender/source/blender/python/api2_2x/Modifier.c 2009-02-12
11:04:08 UTC (rev 18942)
+++ trunk/blender/source/blender/python/api2_2x/Modifier.c 2009-02-12
16:27:19 UTC (rev 18943)
@@ -982,7 +982,42 @@
}
}
+static PyObject *shrinkwrap_getter( BPy_Modifier * self, int type )
+{
+ ShrinkwrapModifierData *md = (ShrinkwrapModifierData *)(self->md);
+ switch( type ) {
+ case EXPP_MOD_OBJECT:
+ return Object_CreatePyObject( md->target );
+ default:
+ return EXPP_ReturnPyObjError( PyExc_KeyError, "key not found" );
+ }
+}
+
+static int shrinkwrap_setter( BPy_Modifier *self, int type, PyObject *value )
+{
+ ShrinkwrapModifierData *md = (ShrinkwrapModifierData *)(self->md);
+
+ switch( type ) {
+ case EXPP_MOD_OBJECT: { /* Only object for now */
+ Object *ob_new=NULL;
+ if (value == Py_None) {
+ md->target = NULL;
+ } else if (BPy_Object_Check( value )) {
+ ob_new = ((( BPy_Object * )value)->object);
+ md->target = ob_new;
+ } else {
+ return EXPP_ReturnIntError( PyExc_TypeError,
+ "Expected an Object or None value" );
+ }
+ return 0;
+ }
+ default:
+ return EXPP_ReturnIntError( PyExc_KeyError, "key not found" );
+ }
+}
+
+
/* static PyObject *uvproject_getter( BPy_Modifier * self, int type )
{
DisplaceModifierData *md = (DisplaceModifierData *)(self->md);
@@ -1062,6 +1097,8 @@
return edgesplit_getter( self, setting );
case eModifierType_Displace:
return displace_getter( self, setting );
+ case eModifierType_Shrinkwrap:
+ return shrinkwrap_getter( self, setting );
/*case eModifierType_UVProject:
return uvproject_getter( self, setting );*/
case eModifierType_Hook:
@@ -1132,6 +1169,8 @@
return edgesplit_setter( self, key_int, arg );
case eModifierType_Displace:
return displace_setter( self, key_int, arg );
+ case eModifierType_Shrinkwrap:
+ return shrinkwrap_setter( self, key_int, arg );
/*case eModifierType_UVProject:
return uvproject_setter( self, key_int, arg );*/
case eModifierType_Hook:
@@ -1550,6 +1589,22 @@
PyInt_FromLong( eModifierType_Cast ) );
PyConstant_Insert( d, "DISPLACE",
PyInt_FromLong( eModifierType_Displace ) );
+ PyConstant_Insert( d, "MESHDEFORM",
+ PyInt_FromLong( eModifierType_MeshDeform ) );
+ PyConstant_Insert( d, "PARTICLESYSTEM",
+ PyInt_FromLong( eModifierType_ParticleSystem )
);
+ PyConstant_Insert( d, "PARTICLEINSTANCE",
+ PyInt_FromLong( eModifierType_ParticleInstance
) );
+ PyConstant_Insert( d, "EXPLODE",
+ PyInt_FromLong( eModifierType_Explode ) );
+ PyConstant_Insert( d, "CLOTH",
+ PyInt_FromLong( eModifierType_Cloth ) );
+ PyConstant_Insert( d, "BEVEL",
+ PyInt_FromLong( eModifierType_Bevel ) );
+ PyConstant_Insert( d, "SHRINKWRAP",
+ PyInt_FromLong( eModifierType_Shrinkwrap ) );
+ PyConstant_Insert( d, "SHRINKWRAP",
+ PyInt_FromLong( eModifierType_Shrinkwrap ) );
}
return S;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18942] branches/blender2.5/blender/source /blender/editors/space_outliner/outliner.c: Dummy commit...
Revision: 18942 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18942 Author: aligorith Date: 2009-02-12 12:04:08 +0100 (Thu, 12 Feb 2009) Log Message: --- Dummy commit... * Added comment for what needs to be done to get KeyingSets fully functional * In previous commit, also made group-locking be taken into account when drawing curves as locked Modified Paths: -- branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c Modified: branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c === --- branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c 2009-02-12 10:41:57 UTC (rev 18941) +++ branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c 2009-02-12 11:04:08 UTC (rev 18942) @@ -3191,7 +3191,7 @@ /* just 'append' property to path * - to prevent memory leaks, we must write to newpath not path, then free old path + swap them */ - // TODO: how to do this? + // TODO: how to do this? we must use 'string' identifiers for collections so that these don't break if data is added/removed //newpath= RNA_path_append(path, NULL, prop, index, NULL); if (path) MEM_freeN(path); ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18941] branches/blender2.5/blender/source /blender: KeyingSets: First working prototype
Revision: 18941
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18941
Author: aligorith
Date: 2009-02-12 11:41:57 +0100 (Thu, 12 Feb 2009)
Log Message:
---
KeyingSets: First working prototype
To use KeyingSets, simply Outliner-select items in the Datablocks view and
press K to add to the active KeyingSet. Then keyframes can be inserted by
choosing the 'Active Keying Set' option when inserting keyframes.
Important notes on the current implementation:
* Only properties directly inside some ID-block that is close to the root (i.e.
main -> objects -> "someobj" -> location, or main -> materials -> "somemat" ->
colour) can be accessed for now, as I haven't got the code for building the
inner-parts of the paths working yet. Help on getting this working is welcome
(hint to Brecht).
* Properties that can be safely included include simple properties "object ->
Dupli Verts", entire arrays "object -> Location" or individual array elements
"object -> Location -> y"
---
Also added typo fix for KeyingSet freeing. It was freeing the KeyingSet instead
of it's paths.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_draw.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
2009-02-12 09:18:35 UTC (rev 18940)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
2009-02-12 10:41:57 UTC (rev 18941)
@@ -248,7 +248,7 @@
MEM_freeN(ksp->rna_path);
/* free path itself */
- BLI_freelinkN(&ks->paths, ks);
+ BLI_freelinkN(&ks->paths, ksp);
}
}
Modified:
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
===
--- branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
2009-02-12 09:18:35 UTC (rev 18940)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
2009-02-12 10:41:57 UTC (rev 18941)
@@ -111,7 +111,7 @@
/* use default settings to make a F-Curve */
fcu= MEM_callocN(sizeof(FCurve), "FCurve");
- fcu->flag |= (FCURVE_VISIBLE|FCURVE_AUTO_HANDLES);
+ fcu->flag =
(FCURVE_VISIBLE|FCURVE_AUTO_HANDLES|FCURVE_SELECTED);
if (act->curves.first==NULL)
fcu->flag |= FCURVE_ACTIVE; /* first one added
active */
@@ -119,7 +119,10 @@
fcu->rna_path= BLI_strdupn(rna_path, strlen(rna_path));
fcu->array_index= array_index;
+ /* set additional flags */
+ // TODO: need to set the FCURVE_INT_VALUES flag must be set if
property is not float!
+
/* if a group name has been provided, try to add or find a
group, then add F-Curve to it */
if (group) {
/* try to find group */
@@ -2019,13 +2022,14 @@
else if (mode == COMMONKEY_MODE_DELETE)
kflag= 0;
-
/* check if the KeyingSet is absolute or not (i.e. does it requires
sources info) */
if (ks->flag & KEYINGSET_ABSOLUTE) {
/* Absolute KeyingSets are simpler to use, as all the
destination info has already been
* provided by the user, and is stored, ready to use, in the
KeyingSet paths.
*/
for (ksp= ks->paths.first; ksp; ksp= ksp->next) {
+ int arraylen, i;
+
/* get pointer to name of group to add channels to */
if (ksp->flag & KSP_FLAG_GROUP_NONE)
groupname= NULL;
@@ -2034,11 +2038,34 @@
else
groupname= ksp->group;
- /* action to take depends on mode */
- if (mode == COMMONKEY_MODE_INSERT)
- success+= insertkey(ksp->id, groupname,
ksp->rna_path, ksp->array_index, cfra, kflag);
- else if (mode == COMMONKEY_MODE_DELETE)
- success+= deletekey(ksp->id, groupname,
ksp->rna_path, ksp->array_index, cfra, kflag);
+ /* init arraylen and i - arraylen should be greater
than i so that
+* normal non-array entries get keyframed cor
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18940] branches/blender2.5/blender/source /blender/editors/space_node/node_draw.c: 2.5
Revision: 18940 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18940 Author: ton Date: 2009-02-12 10:18:35 +0100 (Thu, 12 Feb 2009) Log Message: --- 2.5 Bugfix: node editor crashed when using bitmap fonts, still had a call commented out, happened during migration to get things linked. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c === --- branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c 2009-02-12 06:36:06 UTC (rev 18939) +++ branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c 2009-02-12 09:18:35 UTC (rev 18940) @@ -1108,7 +1108,7 @@ /* aspect+font, set each time */ snode->aspect= (v2d->cur.xmax - v2d->cur.xmin)/((float)ar->winx); - //snode->curfont= uiSetCurFont_ext(snode->aspect); + snode->curfont= uiSetCurFont_ext(snode->aspect); UI_view2d_constant_grid_draw(C, v2d); /* backdrop */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
