[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30734] branches/soc-2010-jwilkins: Merged : 30689-30730
Jason Wilkins
Jason.A.Wilkins at gmail.com
Mon Jul 26 04:51:03 CEST 2010
Revision: 30734
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30734
Author: jwilkins
Date: 2010-07-26 04:51:02 +0200 (Mon, 26 Jul 2010)
Log Message:
-----------
Merged: 30689-30730
Modified Paths:
--------------
branches/soc-2010-jwilkins/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2010-jwilkins/release/scripts/ui/properties_particle.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py
branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_curve.h
branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/curve.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/displist.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/key.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/object.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-jwilkins/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-jwilkins/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_geom.c
branches/soc-2010-jwilkins/source/blender/blenlib/intern/math_rotation.c
branches/soc-2010-jwilkins/source/blender/editors/curve/editcurve.c
branches/soc-2010-jwilkins/source/blender/editors/include/ED_curve.h
branches/soc-2010-jwilkins/source/blender/editors/include/ED_datafiles.h
branches/soc-2010-jwilkins/source/blender/editors/include/UI_icons.h
branches/soc-2010-jwilkins/source/blender/editors/interface/interface_icons.c
branches/soc-2010-jwilkins/source/blender/editors/render/render_preview.c
branches/soc-2010-jwilkins/source/blender/editors/render/render_shading.c
branches/soc-2010-jwilkins/source/blender/editors/screen/area.c
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_intern.h
branches/soc-2010-jwilkins/source/blender/editors/screen/screen_ops.c
branches/soc-2010-jwilkins/source/blender/editors/space_info/info_stats.c
branches/soc-2010-jwilkins/source/blender/editors/space_info/space_info.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_generics.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-jwilkins/source/blender/editors/transform/transform_orientations.c
branches/soc-2010-jwilkins/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-jwilkins/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2010-jwilkins/source/blender/makesdna/intern/makesdna.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_quat.c
branches/soc-2010-jwilkins/source/blender/render/intern/source/gammaCorrectionTables.c
branches/soc-2010-jwilkins/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2010-jwilkins/source/gameengine/Ketsji/KX_Dome.cpp
Modified: branches/soc-2010-jwilkins/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2010-jwilkins/intern/guardedalloc/MEM_guardedalloc.h 2010-07-26 02:35:43 UTC (rev 30733)
+++ branches/soc-2010-jwilkins/intern/guardedalloc/MEM_guardedalloc.h 2010-07-26 02:51:02 UTC (rev 30734)
@@ -63,7 +63,7 @@
extern "C" {
#endif
- /** Returns the lenght of the allocated memory segment pointed at
+ /** Returns the length of the allocated memory segment pointed at
* by vmemh. If the pointer was not previously allocated by this
* module, the result is undefined.*/
size_t MEM_allocN_len(void *vmemh);
Modified: branches/soc-2010-jwilkins/release/scripts/ui/properties_particle.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/properties_particle.py 2010-07-26 02:35:43 UTC (rev 30733)
+++ branches/soc-2010-jwilkins/release/scripts/ui/properties_particle.py 2010-07-26 02:51:02 UTC (rev 30734)
@@ -401,12 +401,13 @@
else:
row.prop(part, "physics_type", text="")
+ row = layout.row()
+ col = row.column(align=True)
+ col.prop(part, "particle_size")
+ col.prop(part, "random_size", slider=True)
+
if part.physics_type != 'NO':
- row = layout.row()
col = row.column(align=True)
- col.prop(part, "particle_size")
- col.prop(part, "random_size", slider=True)
- col = row.column(align=True)
col.prop(part, "mass")
col.prop(part, "sizemass", text="Multiply mass with size")
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py 2010-07-26 02:35:43 UTC (rev 30733)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d.py 2010-07-26 02:51:02 UTC (rev 30734)
@@ -2091,7 +2091,7 @@
col.separator()
col.label(text="Numerics:")
- col.prop(mesh, "draw_edge_lenght")
+ col.prop(mesh, "draw_edge_length")
col.prop(mesh, "draw_edge_angle")
col.prop(mesh, "draw_face_area")
Modified: branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py 2010-07-26 02:35:43 UTC (rev 30733)
+++ branches/soc-2010-jwilkins/release/scripts/ui/space_view3d_toolbar.py 2010-07-26 02:51:02 UTC (rev 30734)
@@ -1351,7 +1351,7 @@
col = layout.column(align=True)
col.active = pe.editable
col.label(text="Keep:")
- col.prop(pe, "keep_lengths", text="Lenghts")
+ col.prop(pe, "keep_lengths", text="Lengths")
col.prop(pe, "keep_root", text="Root")
if not pe.hair:
col.label(text="Correct:")
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_bmesh.h
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_bmesh.h 2010-07-26 02:35:43 UTC (rev 30733)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_bmesh.h 2010-07-26 02:51:02 UTC (rev 30734)
@@ -58,7 +58,7 @@
-Remove the eflags completely, they are mostly not used
-Remove the selection/vis/bevel weight flag/values ect and move them to custom data
-Remove EID member and move to custom data
- -Add a radial cycle length, disk cycle length and loop cycle lenght attributes to custom data and have eulers maintain/use them if present.
+ -Add a radial cycle length, disk cycle length and loop cycle length attributes to custom data and have eulers maintain/use them if present.
-Move data such as vertex coordinates/normals to custom data and leave pointers in structures to active layer data.
-Remove BME_CycleNode structure?
*/
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_curve.h
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_curve.h 2010-07-26 02:35:43 UTC (rev 30733)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_curve.h 2010-07-26 02:51:02 UTC (rev 30734)
@@ -105,5 +105,7 @@
int clamp_nurb_order_u( struct Nurb *nu);
int clamp_nurb_order_v( struct Nurb *nu);
+ListBase *BKE_curve_nurbs(struct Curve *cu);
+
#endif
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sequencer.h 2010-07-26 02:35:43 UTC (rev 30733)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_sequencer.h 2010-07-26 02:51:02 UTC (rev 30734)
@@ -107,15 +107,14 @@
0: no early out,
1: out = ibuf1,
2: out = ibuf2 */
- int (*early_out)(struct Sequence *seq,
- float facf0, float facf1);
+ int (*early_out)(struct Sequence *seq, float facf0, float facf1);
/* stores the y-range of the effect IPO */
void (*store_icu_yrange)(struct Sequence * seq,
short adrcode, float *ymin, float *ymax);
/* stores the default facf0 and facf1 if no IPO is present */
- void (*get_default_fac)(struct Sequence *seq, int cfra,
+ void (*get_default_fac)(struct Sequence *seq, float cfra,
float * facf0, float * facf1);
/* execute the effect
@@ -123,11 +122,12 @@
float-rects or byte-rects
(mixed cases are handled one layer up...) */
- void (*execute)(struct Scene *scene, struct Sequence *seq, int cfra,
- float facf0, float facf1,
- int x, int y, int preview_render_size,
- struct ImBuf *ibuf1, struct ImBuf *ibuf2,
- struct ImBuf *ibuf3, struct ImBuf *out);
+ struct ImBuf* (*execute)(
+ struct Scene *scene, struct Sequence *seq, float cfra,
+ float facf0, float facf1,
+ int x, int y, int preview_render_size,
+ struct ImBuf *ibuf1, struct ImBuf *ibuf2,
+ struct ImBuf *ibuf3);
};
/* ********************* prototypes *************** */
@@ -164,6 +164,10 @@
// intern?
void update_changed_seq_and_deps(struct Scene *scene, struct Sequence *changed_seq, int len_change, int ibuf_change);
+int input_have_to_preprocess(
+ struct Scene *scene, struct Sequence * seq,
+ float cfra, int seqrectx, int seqrecty);
+
/* seqcache.c */
typedef enum {
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c 2010-07-26 02:35:43 UTC (rev 30733)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c 2010-07-26 02:51:02 UTC (rev 30734)
@@ -66,6 +66,8 @@
#include "BKE_utildefines.h"
#include "BKE_depsgraph.h"
+#include "ED_curve.h" /* for ED_curve_nurbs */
+
// XXX bad level call...
/* --------------------- */
@@ -458,17 +460,17 @@
float *fp, *dist, *maxdist, xyz[3];
float fac, d=0, fac1, fac2;
int a, tot, cycl=0;
+ ListBase *nurbs;
/* in a path vertices are with equal differences: path->len = number of verts */
/* NOW WITH BEVELCURVE!!! */
if(ob==NULL || ob->type != OB_CURVE) return;
cu= ob->data;
- if(cu->editnurb)
- nu= cu->editnurb->first;
- else
- nu= cu->nurb.first;
-
+
+ nurbs= BKE_curve_nurbs(cu);
+ nu= nurbs->first;
+
if(cu->path) free_path(cu->path);
cu->path= NULL;
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c 2010-07-26 02:35:43 UTC (rev 30733)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/brush.c 2010-07-26 02:51:02 UTC (rev 30734)
@@ -862,7 +862,6 @@
float startdistance, spacing, step, paintpos[2], dmousepos[2], finalpos[2];
float t, len, press;
const int radius= brush_size(brush);
- const int diameter= 2*radius;
/* compute brush spacing adapted to brush radius, spacing may depend
on pressure, so update it */
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/curve.c 2010-07-26 02:35:43 UTC (rev 30733)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/curve.c 2010-07-26 02:51:02 UTC (rev 30734)
@@ -58,6 +58,8 @@
#include "BKE_object.h"
#include "BKE_utildefines.h" // VECCOPY
+#include "ED_curve.h"
+
/* globals */
/* local */
@@ -104,13 +106,8 @@
BLI_freelistN(&cu->bev);
freedisplist(&cu->disp);
BKE_free_editfont(cu);
-
- if(cu->editnurb) {
- freeNurblist(cu->editnurb);
- MEM_freeN(cu->editnurb);
- cu->editnurb= NULL;
- }
+ free_curve_editNurb(cu);
unlink_curve(cu);
BKE_free_animdata((ID *)cu);
@@ -2008,8 +2005,10 @@
/* STEP 1: MAKE POLYS */
BLI_freelistN(&(cu->bev));
- if(cu->editnurb && ob->type!=OB_FONT) nu= cu->editnurb->first;
- else nu= cu->nurb.first;
+ if(cu->editnurb && ob->type!=OB_FONT) {
+ ListBase *nurbs= ED_curve_editnurbs(cu);
+ nu= nurbs->first;
+ } else nu= cu->nurb.first;
while(nu) {
@@ -2999,7 +2998,7 @@
VECCOPY(co, key); co+=3; key+=3;
VECCOPY(co, key); co+=3; key+=3;
VECCOPY(co, key); co+=3; key+=3;
- key++; /* skip tilt */
+ key+=3; /* skip tilt */
}
}
else {
@@ -3099,5 +3098,12 @@
return change;
}
+/* Get edit nurbs or normal nurbs list */
+ListBase *BKE_curve_nurbs(Curve *cu)
+{
+ if (cu->editnurb) {
+ return ED_curve_editnurbs(cu);
+ }
-
+ return &cu->nurb;
+}
Modified: branches/soc-2010-jwilkins/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/blenkernel/intern/displist.c 2010-07-26 02:35:43 UTC (rev 30733)
+++ branches/soc-2010-jwilkins/source/blender/blenkernel/intern/displist.c 2010-07-26 02:51:02 UTC (rev 30734)
@@ -63,6 +63,7 @@
#include "BLO_sys_types.h" // for intptr_t support
+#include "ED_curve.h" /* for BKE_curve_nurbs */
static void boundbox_displist(Object *ob);
@@ -1221,7 +1222,7 @@
ModifierData *md = modifiers_getVirtualModifierList(ob);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list