[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30759] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30668 :30722
Nicholas Bishop
nicholasbishop at gmail.com
Mon Jul 26 18:48:02 CEST 2010
Revision: 30759
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30759
Author: nicholasbishop
Date: 2010-07-26 18:48:02 +0200 (Mon, 26 Jul 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30668:30722
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_particle.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_curve.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/anim.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/brush.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/curve.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/displist.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/key.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/object.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/particle.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/particle_system.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/seqcache.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/softbody.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_geom.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editcurve.c
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_curve.h
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_transform.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_shading.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/area.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/screen/screen_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_info/info_stats.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_info/space_info.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_generics.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_orientations.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/intern/makesdna.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_camera.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_quat.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/convertblender.c
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/gammaCorrectionTables.c
branches/soc-2010-nicolasbishop/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_Dome.cpp
Property Changed:
----------------
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/seqcache.c
Modified: branches/soc-2010-nicolasbishop/intern/guardedalloc/MEM_guardedalloc.h
===================================================================
--- branches/soc-2010-nicolasbishop/intern/guardedalloc/MEM_guardedalloc.h 2010-07-26 15:14:09 UTC (rev 30758)
+++ branches/soc-2010-nicolasbishop/intern/guardedalloc/MEM_guardedalloc.h 2010-07-26 16:48:02 UTC (rev 30759)
@@ -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-nicolasbishop/release/scripts/io/export_fbx.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py 2010-07-26 15:14:09 UTC (rev 30758)
+++ branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py 2010-07-26 16:48:02 UTC (rev 30759)
@@ -947,10 +947,7 @@
render = scene.render
width = render.resolution_x
height = render.resolution_y
-# render = scene.render
-# width = render.sizeX
-# height = render.sizeY
- aspect = float(width)/height
+ aspect = width / height
data = my_cam.blenObject.data
@@ -962,11 +959,9 @@
file.write('\n\t\t\tProperty: "FieldOfView", "FieldOfView", "A+",%.6f' % math.degrees(data.angle))
file.write('\n\t\t\tProperty: "FieldOfViewX", "FieldOfView", "A+",1')
file.write('\n\t\t\tProperty: "FieldOfViewY", "FieldOfView", "A+",1')
- file.write('\n\t\t\tProperty: "FocalLength", "Real", "A+",14.0323972702026')
+ # file.write('\n\t\t\tProperty: "FocalLength", "Real", "A+",14.0323972702026')
file.write('\n\t\t\tProperty: "OpticalCenterX", "Real", "A+",%.6f' % data.shift_x) # not sure if this is in the correct units?
-# file.write('\n\t\t\tProperty: "OpticalCenterX", "Real", "A+",%.6f' % data.shiftX) # not sure if this is in the correct units?
file.write('\n\t\t\tProperty: "OpticalCenterY", "Real", "A+",%.6f' % data.shift_y) # ditto
-# file.write('\n\t\t\tProperty: "OpticalCenterY", "Real", "A+",%.6f' % data.shiftY) # ditto
file.write('\n\t\t\tProperty: "BackgroundColor", "Color", "A+",0,0,0')
file.write('\n\t\t\tProperty: "TurnTable", "Real", "A+",0')
file.write('\n\t\t\tProperty: "DisplayTurnTableIcon", "bool", "",1')
@@ -975,7 +970,7 @@
file.write('\n\t\t\tProperty: "UseRealTimeMotionBlur", "bool", "",1')
file.write('\n\t\t\tProperty: "ResolutionMode", "enum", "",0')
file.write('\n\t\t\tProperty: "ApertureMode", "enum", "",2')
- file.write('\n\t\t\tProperty: "GateFit", "enum", "",0')
+ file.write('\n\t\t\tProperty: "GateFit", "enum", "",2')
file.write('\n\t\t\tProperty: "CameraFormat", "enum", "",0')
file.write('\n\t\t\tProperty: "AspectW", "double", "",%i' % width)
file.write('\n\t\t\tProperty: "AspectH", "double", "",%i' % height)
Modified: branches/soc-2010-nicolasbishop/release/scripts/ui/properties_particle.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/properties_particle.py 2010-07-26 15:14:09 UTC (rev 30758)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/properties_particle.py 2010-07-26 16:48:02 UTC (rev 30759)
@@ -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-nicolasbishop/release/scripts/ui/space_view3d.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py 2010-07-26 15:14:09 UTC (rev 30758)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py 2010-07-26 16:48:02 UTC (rev 30759)
@@ -2084,7 +2084,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-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py 2010-07-26 15:14:09 UTC (rev 30758)
+++ branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py 2010-07-26 16:48:02 UTC (rev 30759)
@@ -1389,7 +1389,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-nicolasbishop/source/blender/blenkernel/BKE_bmesh.h
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_bmesh.h 2010-07-26 15:14:09 UTC (rev 30758)
+++ branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_bmesh.h 2010-07-26 16:48:02 UTC (rev 30759)
@@ -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-nicolasbishop/source/blender/blenkernel/BKE_curve.h
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_curve.h 2010-07-26 15:14:09 UTC (rev 30758)
+++ branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_curve.h 2010-07-26 16:48:02 UTC (rev 30759)
@@ -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-nicolasbishop/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_sequencer.h 2010-07-26 15:14:09 UTC (rev 30758)
+++ branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_sequencer.h 2010-07-26 16:48:02 UTC (rev 30759)
@@ -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-nicolasbishop/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/anim.c 2010-07-26 15:14:09 UTC (rev 30758)
+++ branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/anim.c 2010-07-26 16:48:02 UTC (rev 30759)
@@ -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-nicolasbishop/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/brush.c 2010-07-26 15:14:09 UTC (rev 30758)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list