Revision: 29652
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29652
Author: campbellbarton
Date: 2010-06-23 16:39:03 +0200 (Wed, 23 Jun 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29614:29651
Modified Paths:
--------------
branches/render25/release/scripts/ui/properties_data_curve.py
branches/render25/release/scripts/ui/properties_render.py
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/source/blender/blenkernel/BKE_displist.h
branches/render25/source/blender/blenkernel/BKE_key.h
branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
branches/render25/source/blender/blenkernel/intern/displist.c
branches/render25/source/blender/blenkernel/intern/key.c
branches/render25/source/blender/blenkernel/intern/mesh.c
branches/render25/source/blender/blenkernel/intern/seqeffects.c
branches/render25/source/blender/editors/curve/editcurve.c
branches/render25/source/blender/editors/include/ED_screen.h
branches/render25/source/blender/editors/mesh/editmesh_mods.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/render/render_internal.c
branches/render25/source/blender/editors/screen/area.c
branches/render25/source/blender/editors/sculpt_paint/sculpt.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/editors/space_time/space_time.c
branches/render25/source/blender/editors/space_view3d/space_view3d.c
branches/render25/source/blender/imbuf/intern/targa.c
branches/render25/source/blender/makesdna/DNA_screen_types.h
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_sequencer.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/render25/source/blender/python/doc/examples/mathutils.py
branches/render25/source/blender/python/generic/geometry.c
branches/render25/source/blender/python/generic/mathutils.c
branches/render25/source/blender/windowmanager/intern/wm_draw.c
Modified: branches/render25/release/scripts/ui/properties_data_curve.py
===================================================================
--- branches/render25/release/scripts/ui/properties_data_curve.py
2010-06-23 14:24:58 UTC (rev 29651)
+++ branches/render25/release/scripts/ui/properties_data_curve.py
2010-06-23 14:39:03 UTC (rev 29652)
@@ -378,25 +378,25 @@
boxy = layout.box()
- split = boxy.split()
+ row = boxy.row()
- col = split.column()
-
- col2 = col.column(align=True)
- col2.label(text="Dimensions:")
- col2.prop(box, "width", text="Width")
- col2.prop(box, "height", text="Height")
+ split = row.split()
+
+ col = split.column(align=True)
+ col.label(text="Dimensions:")
+ col.prop(box, "width", text="Width")
+ col.prop(box, "height", text="Height")
+
if wide_ui:
- col = split.column()
+ col = split.column(align=True)
- row = col.row()
- row.label(text="Offset:")
- row.operator("font.textbox_remove", text='', icon='X').index = i
+ col.label(text="Offset:")
+ col.prop(box, "x", text="X")
+ col.prop(box, "y", text="Y")
- col2 = col.column(align=True)
- col2.prop(box, "x", text="X")
- col2.prop(box, "y", text="Y")
+ row.operator("font.textbox_remove", text='', icon='X').index = i
+
classes = [
DATA_PT_context_curve,
Modified: branches/render25/release/scripts/ui/properties_render.py
===================================================================
--- branches/render25/release/scripts/ui/properties_render.py 2010-06-23
14:24:58 UTC (rev 29651)
+++ branches/render25/release/scripts/ui/properties_render.py 2010-06-23
14:39:03 UTC (rev 29652)
@@ -527,6 +527,7 @@
row = layout.row()
row.prop(rd, "motion_blur_samples")
+ row.prop(rd, "motion_blur_shutter")
class RENDER_PT_dimensions(RenderButtonsPanel):
Modified: branches/render25/release/scripts/ui/space_sequencer.py
===================================================================
--- branches/render25/release/scripts/ui/space_sequencer.py 2010-06-23
14:24:58 UTC (rev 29651)
+++ branches/render25/release/scripts/ui/space_sequencer.py 2010-06-23
14:39:03 UTC (rev 29652)
@@ -351,7 +351,6 @@
row = layout.row()
row.prop(strip, "lock")
- row.prop(strip, "frame_locked", text="Frame Lock")
col = layout.column()
col.enabled = not strip.lock
Modified: branches/render25/source/blender/blenkernel/BKE_displist.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_displist.h 2010-06-23
14:24:58 UTC (rev 29651)
+++ branches/render25/source/blender/blenkernel/BKE_displist.h 2010-06-23
14:39:03 UTC (rev 29652)
@@ -99,7 +99,7 @@
int surfindex_displist(DispList *dl, int a, int *b, int *p1, int *p2, int *p3,
int *p4);
void imagestodisplist(void);
void reshadeall_displist(struct Scene *scene);
-void filldisplist(struct ListBase *dispbase, struct ListBase *to);
+void filldisplist(struct ListBase *dispbase, struct ListBase *to, int
flipnormal);
void fastshade_free_render(void);
Modified: branches/render25/source/blender/blenkernel/BKE_key.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_key.h 2010-06-23
14:24:58 UTC (rev 29651)
+++ branches/render25/source/blender/blenkernel/BKE_key.h 2010-06-23
14:39:03 UTC (rev 29652)
@@ -77,6 +77,7 @@
void curve_to_key(struct Curve *cu, struct KeyBlock *kb, struct ListBase
*nurb);
float (*key_to_vertcos(struct Object *ob, struct KeyBlock *kb))[3];
void vertcos_to_key(struct Object *ob, struct KeyBlock *kb, float
(*vertCos)[3]);
+void offset_to_key(struct Object *ob, struct KeyBlock *kb, float (*ofs)[3]);
#ifdef __cplusplus
};
Modified: branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
2010-06-23 14:24:58 UTC (rev 29651)
+++ branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
2010-06-23 14:39:03 UTC (rev 29652)
@@ -247,8 +247,8 @@
/* if the number of verts has changed, remove invalid data */
if(tmp.totvert != me->totvert) {
- if(me->key) me->key->id.us--;
- me->key = NULL;
+ if(tmp.key) tmp.key->id.us--;
+ tmp.key = NULL;
}
*me = tmp;
Modified: branches/render25/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/displist.c
2010-06-23 14:24:58 UTC (rev 29651)
+++ branches/render25/source/blender/blenkernel/intern/displist.c
2010-06-23 14:39:03 UTC (rev 29652)
@@ -929,7 +929,7 @@
}
-void filldisplist(ListBase *dispbase, ListBase *to)
+void filldisplist(ListBase *dispbase, ListBase *to, int flipnormal)
{
EditVert *eve, *v1, *vlast;
EditFace *efa;
@@ -1023,6 +1023,9 @@
index[0]= (intptr_t)efa->v1->tmp.l;
index[1]= (intptr_t)efa->v2->tmp.l;
index[2]= (intptr_t)efa->v3->tmp.l;
+
+ if(flipnormal)
+ SWAP(int, index[0], index[2]);
index+= 3;
efa= efa->next;
@@ -1099,13 +1102,13 @@
dl= dl->next;
}
- filldisplist(&front, dispbase);
- filldisplist(&back, dispbase);
+ filldisplist(&front, dispbase, 1);
+ filldisplist(&back, dispbase, 0);
freedisplist(&front);
freedisplist(&back);
- filldisplist(dispbase, dispbase);
+ filldisplist(dispbase, dispbase, 0);
}
@@ -1117,7 +1120,7 @@
bevels_to_filledpoly(cu, dispbase);
}
else {
- filldisplist(dispbase, dispbase);
+ filldisplist(dispbase, dispbase, 0);
}
}
@@ -1319,7 +1322,7 @@
ModifierData *preTesselatePoint;
Curve *cu= ob->data;
ListBase *nurb= cu->editnurb?cu->editnurb:&cu->nurb;
- int required_mode, totvert;
+ int required_mode, totvert = 0;
int editmode = (!forRender && cu->editnurb);
DerivedMesh *dm= NULL, *ndm;
float (*vertCos)[3] = NULL;
@@ -1859,6 +1862,12 @@
DM_set_object_boundbox (ob, ob->derivedFinal);
} else {
boundbox_displist (ob);
+
+ /* if there is no derivedMesh, object's boundbox is unneeded */
+ if (ob->bb) {
+ MEM_freeN(ob->bb);
+ ob->bb= NULL;
+ }
}
}
Modified: branches/render25/source/blender/blenkernel/intern/key.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/key.c 2010-06-23
14:24:58 UTC (rev 29651)
+++ branches/render25/source/blender/blenkernel/intern/key.c 2010-06-23
14:39:03 UTC (rev 29652)
@@ -1868,3 +1868,54 @@
}
}
}
+
+void offset_to_key(Object *ob, KeyBlock *kb, float (*ofs)[3])
+{
+ int a;
+ float *co= (float*)ofs, *fp= kb->data;
+
+ if(ELEM(ob->type, OB_MESH, OB_LATTICE)) {
+ for (a= 0; a<kb->totelem; a++, fp+=3, co+=3) {
+ add_v3_v3(fp, co);
+ }
+ } else if(ELEM(ob->type, OB_CURVE, OB_SURF)) {
+ Curve *cu= (Curve*)ob->data;
+ Nurb *nu= cu->nurb.first;
+ BezTriple *bezt;
+ BPoint *bp;
+
+ while (nu) {
+ if(nu->bezt) {
+ int i;
+ bezt= nu->bezt;
+ a= nu->pntsu;
+
+ while (a--) {
+ for (i= 0; i<3; i++) {
+ add_v3_v3(fp, co);
+ fp+= 3; co+= 3;
+ }
+
+ fp+= 3; /* skip alphas */
+
+ bezt++;
+ }
+ }
+ else {
+ bp= nu->bp;
+ a= nu->pntsu*nu->pntsv;
+
+ while (a--) {
+ add_v3_v3(fp, co);
+
+ fp+= 4;
+ co+= 3;
+
+ bp++;
+ }
+ }
+
+ nu= nu->next;
+ }
+ }
+}
Modified: branches/render25/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/mesh.c 2010-06-23
14:24:58 UTC (rev 29651)
+++ branches/render25/source/blender/blenkernel/intern/mesh.c 2010-06-23
14:39:03 UTC (rev 29652)
@@ -1185,6 +1185,12 @@
if (needsFree) {
ob->derivedFinal = NULL;
+
+ /* curve object could have got bounding box only in special
cases */
+ if(ob->bb) {
+ MEM_freeN(ob->bb);
+ ob->bb= NULL;
+ }
}
}
Modified: branches/render25/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/seqeffects.c
2010-06-23 14:24:58 UTC (rev 29651)
+++ branches/render25/source/blender/blenkernel/intern/seqeffects.c
2010-06-23 14:39:03 UTC (rev 29652)
@@ -2802,7 +2802,7 @@
v = (SpeedControlVars *)seq->effectdata;
v->globalSpeed = 1.0;
v->frameMap = 0;
- v->flags = SEQ_SPEED_COMPRESS_IPO_Y;
+ v->flags = 0;
v->length = 0;
}
@@ -2925,14 +2925,8 @@
for (cfra = 1; cfra < v->length; cfra++) {
if(fcu) {
- if((seq->flag & SEQ_IPO_FRAME_LOCKED) != 0) {
- ctime = seq->startdisp + cfra;
- div = 1.0;
- } else {
- ctime= cfra;
- div= v->length / 100.0f;
- if(div==0.0) return;
- }
+ ctime = seq->startdisp + cfra;
+ div = 1.0;
facf = evaluate_fcurve(fcu, ctime/div);
} else {
@@ -2956,14 +2950,8 @@
for (cfra = 0; cfra < v->length; cfra++) {
if(fcu) {
- if((seq->flag & SEQ_IPO_FRAME_LOCKED) != 0) {
- ctime = seq->startdisp + cfra;
- div = 1.0;
- } else {
- ctime= cfra;
- div= v->length / 100.0f;
- if(div==0.0) return;
- }
+ ctime = seq->startdisp + cfra;
+ div = 1.0;
facf = evaluate_fcurve(fcu, ctime / div);
if (v->flags & SEQ_SPEED_COMPRESS_IPO_Y) {
Modified: branches/render25/source/blender/editors/curve/editcurve.c
===================================================================
--- branches/render25/source/blender/editors/curve/editcurve.c 2010-06-23
14:24:58 UTC (rev 29651)
+++ branches/render25/source/blender/editors/curve/editcurve.c 2010-06-23
14:39:03 UTC (rev 29652)
@@ -5256,54 +5256,62 @@
return nu;
}
-static int curve_prim_add(bContext *C, wmOperator *op, int type){
+static int curvesurf_prim_add(bContext *C, wmOperator *op, int type, int
isSurf) {
Object *obedit= CTX_data_edit_object(C);
ListBase *editnurb;
Nurb *nu;
- int newob= 0;//, type= RNA_enum_get(op->ptr, "type");
+ int newob= 0;
int enter_editmode;
unsigned int layer;
float loc[3], rot[3];
float mat[4][4];
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
