Revision: 18599
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18599
Author: joeedh
Date: 2009-01-21 06:23:39 +0100 (Wed, 21 Jan 2009)
Log Message:
-----------
merge with 2.5 at r18598, also made the test 2.5 operator use the (naive) edge
subdivide bmop
Modified Paths:
--------------
branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/bmesh/blender/source/Makefile
branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
branches/bmesh/blender/source/blender/blenkernel/BKE_fcurve.h
branches/bmesh/blender/source/blender/blenkernel/BKE_ipo.h
branches/bmesh/blender/source/blender/blenkernel/BKE_screen.h
branches/bmesh/blender/source/blender/blenkernel/BKE_sequence.h
branches/bmesh/blender/source/blender/blenkernel/intern/context.c
branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenkernel/intern/screen.c
branches/bmesh/blender/source/blender/blenkernel/intern/sequence.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/SConscript
branches/bmesh/blender/source/blender/editors/animation/anim_channels.c
branches/bmesh/blender/source/blender/editors/animation/anim_draw.c
branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
branches/bmesh/blender/source/blender/editors/animation/keyframes_draw.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/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/gpencil/gpencil.c
branches/bmesh/blender/source/blender/editors/include/ED_anim_api.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_object.h
branches/bmesh/blender/source/blender/editors/include/ED_screen.h
branches/bmesh/blender/source/blender/editors/include/ED_view3d.h
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/mesh/editface.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_add.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_mods.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_tools.c
branches/bmesh/blender/source/blender/editors/mesh/mesh_intern.h
branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
branches/bmesh/blender/source/blender/editors/object/editgroup.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/object/object_intern.h
branches/bmesh/blender/source/blender/editors/object/object_ops.c
branches/bmesh/blender/source/blender/editors/preview/SConscript
branches/bmesh/blender/source/blender/editors/screen/area.c
branches/bmesh/blender/source/blender/editors/screen/screen_edit.c
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/sculpt/sculpt.c
branches/bmesh/blender/source/blender/editors/space_action/action_draw.c
branches/bmesh/blender/source/blender/editors/space_action/action_edit.c
branches/bmesh/blender/source/blender/editors/space_action/action_header.c
branches/bmesh/blender/source/blender/editors/space_action/action_select.c
branches/bmesh/blender/source/blender/editors/space_api/spacetypes.c
branches/bmesh/blender/source/blender/editors/space_node/node_select.c
branches/bmesh/blender/source/blender/editors/space_outliner/space_outliner.c
branches/bmesh/blender/source/blender/editors/space_sequencer/Makefile
branches/bmesh/blender/source/blender/editors/space_sequencer/SConscript
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_intern.h
branches/bmesh/blender/source/blender/editors/space_sequencer/space_sequencer.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawmesh.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/editors/space_view3d/vpaint.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform.h
branches/bmesh/blender/source/blender/editors/transform/transform_constraints.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
branches/bmesh/blender/source/blender/editors/transform/transform_manipulator.c
branches/bmesh/blender/source/blender/editors/transform/transform_numinput.c
branches/bmesh/blender/source/blender/editors/transform/transform_ops.c
branches/bmesh/blender/source/blender/editors/transform/transform_orientations.c
branches/bmesh/blender/source/blender/editors/transform/transform_snap.c
branches/bmesh/blender/source/blender/gpu/GPU_draw.h
branches/bmesh/blender/source/blender/gpu/GPU_extensions.h
branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
branches/bmesh/blender/source/blender/makesdna/DNA_action_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_anim_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_screen_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_sequence_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_view3d_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_sequence.c
branches/bmesh/blender/source/blender/windowmanager/WM_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/bmesh/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/bmesh/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
Added Paths:
-----------
branches/bmesh/blender/source/blender/editors/preview/previewrender.c
branches/bmesh/blender/source/blender/editors/preview/previewrender_intern.h
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_add.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_ops.c
branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_select.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_draw.c
Modified:
branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
===================================================================
--- branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-01-21 02:24:12 UTC (rev 18598)
+++ branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
2009-01-21 05:23:39 UTC (rev 18599)
@@ -795,6 +795,10 @@
Name="space_sequencer"
>
<File
+
RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_add.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_draw.c"
>
</File>
@@ -811,10 +815,18 @@
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_ops.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_scopes.c"
>
</File>
<File
+
RelativePath="..\..\..\source\blender\editors\space_sequencer\sequencer_select.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\editors\space_sequencer\space_sequencer.c"
>
</File>
@@ -1135,6 +1147,18 @@
>
</File>
</Filter>
+ <Filter
+ Name="preview"
+ >
+ <File
+
RelativePath="..\..\..\source\blender\editors\preview\previewrender.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\source\blender\editors\preview\previewrender_intern.h"
+ >
+ </File>
+ </Filter>
</Files>
<Globals>
</Globals>
Modified: branches/bmesh/blender/source/Makefile
===================================================================
--- branches/bmesh/blender/source/Makefile 2009-01-21 02:24:12 UTC (rev
18598)
+++ branches/bmesh/blender/source/Makefile 2009-01-21 05:23:39 UTC (rev
18599)
@@ -235,6 +235,7 @@
PULIB += $(OCGDIR)/blender/ed_ipo/libed_ipo.a
PULIB += $(OCGDIR)/blender/ed_outliner/libed_outliner.a
PULIB += $(OCGDIR)/blender/ed_time/libed_time.a
+PULIB += $(OCGDIR)/blender/ed_preview/libed_preview.a
PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a
PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a
PULIB += $(OCGDIR)/blender/ed_object/libed_object.a
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
2009-01-21 02:24:12 UTC (rev 18598)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
2009-01-21 05:23:39 UTC (rev 18599)
@@ -45,6 +45,8 @@
struct Scene;
struct ScrArea;
struct SpaceLink;
+struct View3D;
+struct RegionView3D;
struct StructRNA;
struct ToolSettings;
struct Image;
@@ -96,6 +98,7 @@
struct ScrArea *CTX_wm_area(const bContext *C);
struct SpaceLink *CTX_wm_space_data(const bContext *C);
struct View3D *CTX_wm_view3d(const bContext *C);
+struct RegionView3D *CTX_wm_region_view3d(const bContext *C);
struct ARegion *CTX_wm_region(const bContext *C);
void *CTX_wm_region_data(const bContext *C);
struct uiBlock *CTX_wm_ui_block(const bContext *C);
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_fcurve.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_fcurve.h
2009-01-21 02:24:12 UTC (rev 18598)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_fcurve.h
2009-01-21 05:23:39 UTC (rev 18599)
@@ -85,6 +85,9 @@
/* find matching F-Curve in the given list of F-Curves */
struct FCurve *list_find_fcurve(ListBase *list, const char rna_path[], const
int array_index);
+/* get the time extents for F-Curve */
+void calc_fcurve_range(struct FCurve *fcu, float *min, float *max);
+
/* -------- Curve Sanity -------- */
void calchandles_fcurve(struct FCurve *fcu);
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_ipo.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_ipo.h 2009-01-21
02:24:12 UTC (rev 18598)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_ipo.h 2009-01-21
05:23:39 UTC (rev 18599)
@@ -38,9 +38,11 @@
/* -------- IPO-Curve (Bezier) Calculations ---------- */
+// xxx perhaps this should be in curve api not in anim api
void correct_bezpart(float *v1, float *v2, float *v3, float *v4);
-
+
+// XXX this file will soon be depreceated...
#if 0 // XXX old animation system
typedef struct CfraElem {
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_screen.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_screen.h
2009-01-21 02:24:12 UTC (rev 18598)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_screen.h
2009-01-21 05:23:39 UTC (rev 18599)
@@ -105,6 +105,10 @@
void (*free)(struct ARegion *);
+ /* split region, copy data optionally */
+ void *(*duplicate)(void *);
+
+
/* register operator types on startup */
void (*operatortypes)(void);
/* add own items to keymap */
@@ -127,6 +131,7 @@
/* spacetypes */
struct SpaceType *BKE_spacetype_from_id(int spaceid);
+struct ARegionType *BKE_regiontype_from_id(struct SpaceType *st, int regionid);
const struct ListBase *BKE_spacetypes_list(void);
void BKE_spacetype_register(struct SpaceType *st);
void BKE_spacetypes_free(void); /* only for quitting blender */
@@ -136,8 +141,8 @@
void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2);
/* area/regions */
-struct ARegion *BKE_area_region_copy(struct ARegion *ar);
-void BKE_area_region_free(struct ARegion *ar);
+struct ARegion *BKE_area_region_copy(struct SpaceType *st, struct ARegion *ar);
+void BKE_area_region_free(struct SpaceType *st, struct ARegion *ar);
void BKE_screen_area_free(struct ScrArea *sa);
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_sequence.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_sequence.h
2009-01-21 02:24:12 UTC (rev 18598)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_sequence.h
2009-01-21 05:23:39 UTC (rev 18599)
@@ -146,6 +146,7 @@
struct ImBuf *give_ibuf_seq_direct(struct Scene *scene, int rectx, int recty,
int cfra, struct Sequence *seq);
void give_ibuf_prefetch_request(int rectx, int recty, int cfra, int chanshown);
void calc_sequence(struct Sequence *seq);
+void calc_sequence_disp(struct Sequence *seq);
void new_tstripdata(struct Sequence *seq);
void reload_sequence_new_file(struct Scene *scene, struct Sequence * seq);
void sort_seq(struct Scene *scene);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/context.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/context.c
2009-01-21 02:24:12 UTC (rev 18598)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/context.c
2009-01-21 05:23:39 UTC (rev 18599)
@@ -171,6 +171,13 @@
return NULL;
}
+RegionView3D *CTX_wm_region_view3d(const bContext *C)
+{
+ if(C->wm.area && C->wm.area->spacetype==SPACE_VIEW3D)
+ if(C->wm.region)
+ return C->wm.region->regiondata;
+ return NULL;
+}
ARegion *CTX_wm_region(const bContext *C)
{
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
2009-01-21 02:24:12 UTC (rev 18598)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
2009-01-21 05:23:39 UTC (rev 18599)
@@ -169,6 +169,37 @@
return NULL;
}
+/* Calculate the extents of F-Curve's keyframes */
+void calc_fcurve_range (FCurve *fcu, float *start, float *end)
+{
+ float min=999999999.0f, max=-999999999.0f;
+ short foundvert=0;
+
+ if (fcu->totvert) {
+ if (fcu->bezt) {
+ min= MIN2(min, fcu->bezt[0].vec[1][0]);
+ max= MAX2(max, fcu->bezt[fcu->totvert-1].vec[1][0]);
+ }
+ else if (fcu->fpt) {
+ min= MIN2(min, fcu->fpt[0].vec[0]);
+ max= MAX2(max, fcu->fpt[fcu->totvert-1].vec[0]);
+ }
+
+ foundvert=1;
+ }
+
+ /* minimum length is 1 frame */
+ if (foundvert) {
+ if (min == max) max += 1.0f;
+ *start= min;
+ *end= max;
+ }
+ else {
+ *start= 0.0f;
+ *end= 1.0f;
+ }
+}
+
/* ***************************** Keyframe Column Tools
********************************* */
/* add a BezTriple to a column */
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/object.c
2009-01-21 02:24:12 UTC (rev 18598)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/object.c
2009-01-21 05:23:39 UTC (rev 18599)
@@ -546,11 +546,11 @@
if(v3d->camera==ob) {
v3d->camera= NULL;
- if(v3d->persp==V3D_CAMOB)
v3d->persp= V3D_PERSP;
+ // XXX
if(v3d->persp==V3D_CAMOB) v3d->persp= V3D_PERSP;
}
if(v3d->localvd &&
v3d->localvd->camera==ob ) {
v3d->localvd->camera= NULL;
-
if(v3d->localvd->persp==V3D_CAMOB) v3d->localvd->persp= V3D_PERSP;
+ // XXX
if(v3d->localvd->persp==V3D_CAMOB) v3d->localvd->persp= V3D_PERSP;
}
}
else if(sl->spacetype==SPACE_OOPS) {
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/screen.c
2009-01-21 02:24:12 UTC (rev 18598)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/screen.c
2009-01-21 05:23:39 UTC (rev 18599)
@@ -82,6 +82,19 @@
return NULL;
}
+ARegionType *BKE_regiontype_from_id(SpaceType *st, int regionid)
+{
+ ARegionType *art;
+
+ for(art= st->regiontypes.first; art; art= art->next)
+ if(art->regionid==regionid)
+ return art;
+
+ printf("Error, region type missing in %s\n", st->name);
+ return st->regiontypes.first;
+}
+
+
const ListBase *BKE_spacetypes_list()
{
return &spacetypes;
@@ -113,9 +126,9 @@
SpaceType *st= BKE_spacetype_from_id(sl->spacetype);
/* free regions for pushed spaces */
- for(ar=sl->regionbase.first; ar; ar=ar->next) {
- BKE_area_region_free(ar);
- }
+ for(ar=sl->regionbase.first; ar; ar=ar->next)
+ BKE_area_region_free(st, ar);
+
BLI_freelistN(&sl->regionbase);
if(st && st->free)
@@ -125,19 +138,26 @@
BLI_freelistN(lb);
}
-ARegion *BKE_area_region_copy(ARegion *ar)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
