[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23105] branches/bmesh/blender/source/ blender: editmode undo stores data as mesh dna now, instead of bmesh copies .
Revision: 23105
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23105
Author: joeedh
Date: 2009-09-10 08:08:52 +0200 (Thu, 10 Sep 2009)
Log Message:
---
editmode undo stores data as mesh dna now, instead of bmesh copies. also fixed
a bug related to vpaint and hide flags.
Modified Paths:
--
branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
branches/bmesh/blender/source/blender/blenkernel/intern/library.c
branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
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/mesh_conv.c
branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
===
--- branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h 2009-09-10
04:12:22 UTC (rev 23104)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h 2009-09-10
06:08:52 UTC (rev 23105)
@@ -66,7 +66,7 @@
int totloop, int totpoly);
void unlink_mesh(struct Mesh *me);
-void free_mesh(struct Mesh *me);
+void free_mesh(struct Mesh *me, int unlink);
struct Mesh *add_mesh(char *name);
struct Mesh *copy_mesh(struct Mesh *me);
void mesh_update_customdata_pointers(struct Mesh *me);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/library.c
===
--- branches/bmesh/blender/source/blender/blenkernel/intern/library.c
2009-09-10 04:12:22 UTC (rev 23104)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/library.c
2009-09-10 06:08:52 UTC (rev 23105)
@@ -516,7 +516,7 @@
free_object((Object *)id);
break;
case ID_ME:
- free_mesh((Mesh *)id);
+ free_mesh((Mesh *)id, 1);
break;
case ID_CU:
free_curve((Curve *)id);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
===
--- branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
2009-09-10 04:12:22 UTC (rev 23104)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
2009-09-10 06:08:52 UTC (rev 23105)
@@ -206,9 +206,10 @@
/* do not free mesh itself */
-void free_mesh(Mesh *me)
+void free_mesh(Mesh *me, int unlink)
{
- unlink_mesh(me);
+ if (unlink)
+ unlink_mesh(me);
if(me->pv) {
if(me->pv->vert_map) MEM_freeN(me->pv->vert_map);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
===
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
2009-09-10 04:12:22 UTC (rev 23104)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
2009-09-10 06:08:52 UTC (rev 23105)
@@ -195,7 +195,7 @@
float (*projectverts)[3];
/*first, find out the largest face in mesh*/
- for(f = BMIter_New(&faces, bm, BM_FACES_OF_MESH, bm ); f; f =
BMIter_Step(&faces)){
+ BM_ITER(f, &faces, bm, BM_FACES_OF_MESH, NULL) {
if (BM_TestHFlag(f, BM_HIDDEN))
continue;
@@ -209,7 +209,7 @@
projectverts = MEM_callocN(sizeof(float) * maxlength * 3, "BM normal
computation array");
/*calculate all face normals*/
- for(f = BMIter_New(&faces, bm, BM_FACES_OF_MESH, bm ); f; f =
BMIter_Step(&faces)){
+ BM_ITER(f, &faces, bm, BM_FACES_OF_MESH, NULL) {
if (BM_TestHFlag(f, BM_HIDDEN))
continue;
if (f->head.flag & BM_NONORMCALC)
@@ -219,7 +219,7 @@
}
/*Zero out vertex normals*/
- for(v = BMIter_New(&verts, bm, BM_VERTS_OF_MESH, bm ); v; v =
BMIter_Step(&verts)) {
+ BM_ITER(v, &verts, bm, BM_VERTS_OF_MESH, NULL) {
if (BM_TestHFlag(v, BM_HIDDEN))
continue;
@@ -227,7 +227,7 @@
}
/*add face normals to vertices*/
- for(f = BMIter_New(&faces, bm, BM_FACES_OF_MESH, bm ); f; f =
BMIter_Step(&faces)){
+ BM_ITER(f, &faces, bm, BM_FACES_OF_MESH, NULL) {
if (BM_TestHFlag(f, BM_HIDDEN))
continue;
@@ -236,7 +236,7 @@
}
/*average the vertex normals*/
- for(v = BMIter_New(&verts, bm, BM_VERTS_OF_MESH, bm ); v; v
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23104] branches/blender2.5/blender/source /blender: Added Levels Node (histogram, with mean/std deviation outputs)
Revision: 23104
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23104
Author: scourage
Date: 2009-09-10 06:12:22 +0200 (Thu, 10 Sep 2009)
Log Message:
---
Added Levels Node (histogram, with mean/std deviation outputs)
Added RGB space distance matte Node
Added HSV color matte Node
Fixed Image difference matte Node to use image differences instead of RGB space
distance
Fixed luminance node for low end values being read wrong
Fixed CMP_util copy/swap functions not accounting for all channels
Fixed UI for difference matte Node
Added RNA for new nodes
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_node.h
branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree_types.h
branches/blender2.5/blender/source/blender/nodes/CMP_node.h
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_util.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_util.h
Added Paths:
---
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_node.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_node.h
2009-09-10 03:59:12 UTC (rev 23103)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_node.h
2009-09-10 04:12:22 UTC (rev 23104)
@@ -25,7 +25,7 @@
*
* The Original Code is: all of this file.
*
- * Contributor(s): none yet.
+ * Contributor(s): Bob Holcomb.
*
* * END GPL LICENSE BLOCK *
*/
@@ -325,7 +325,7 @@
#define CMP_NODE_COMBYUVA 234
#define CMP_NODE_DIFF_MATTE235
#define CMP_NODE_COLOR_SPILL 236
-#define CMP_NODE_CHROMA237
+#define CMP_NODE_CHROMA_MATTE 237
#define CMP_NODE_CHANNEL_MATTE 238
#define CMP_NODE_FLIP 239
#define CMP_NODE_SPLITVIEWER 240
@@ -345,6 +345,9 @@
#define CMP_NODE_DBLUR 254
#define CMP_NODE_BILATERALBLUR 255
#define CMP_NODE_PREMULKEY 256
+#define CMP_NODE_DIST_MATTE257
+#define CMP_NODE_VIEW_LEVELS258
+#define CMP_NODE_COLOR_MATTE 259
#define CMP_NODE_GLARE 301
#define CMP_NODE_TONEMAP 302
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
2009-09-10 03:59:12 UTC (rev 23103)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
2009-09-10 04:12:22 UTC (rev 23104)
@@ -22,7 +22,7 @@
*
* The Original Code is: all of this file.
*
- * Contributor(s): none yet.
+ * Contributor(s): Bob Holcomb.
*
* * END GPL LICENSE BLOCK *
*/
@@ -2597,7 +2597,7 @@
if(outsocket_exists(lnode->new_node,
lsock->new_sock)) {
lsock->new_sock->ns.data=
lsock->ns.data;
lsock->ns.data= NULL;
- lsock->new_sock= NULL;
+ lsock->new_sock= NULL;
}
}
}
@@ -2932,6 +2932,7 @@
nodeRegisterType(ntypelist, &cmp_node_viewer);
nodeRegisterType(ntypelist, &cmp_node_splitviewer);
nodeRegisterType(ntypelist, &cmp_node_output_file);
+ nodeRegisterType(ntypelist, &cmp_node_view_levels);
nodeRegisterType(ntypelist, &cmp_node_curve_rgb);
nodeRegisterType(ntypelist, &cmp_node_mix_rgb);
@@ -2971,7 +2972,9 @@
nodeRegisterType(ntypelist, &cmp_node_premulkey);
nodeRegisterType(ntypelist, &cmp_node_diff_matte);
- nodeRegisterType(ntypelist, &cmp_node_chroma);
+ nodeRegisterType(ntypelist, &cmp_node_distance_matte);
+ nodeRegisterType(ntypelist, &cmp_node_chroma_matte);
+ nodeRegisterType(ntypelist, &cmp_node_color_matte);
nodeRegisterType(ntypelist, &cmp_node_channel_matte);
nodeRegisterType(ntypelist, &cmp_node_color_spill);
nodeRegisterType(ntypelist, &cmp_node
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23103] branches/bmesh/blender/source/ blender: commit of transform pinning patch by Fabian Fricke (frigi).
Revision: 23103
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23103
Author: joeedh
Date: 2009-09-10 05:59:12 +0200 (Thu, 10 Sep 2009)
Log Message:
---
commit of transform pinning patch by Fabian Fricke (frigi). wip hotkey is
enter/alt-enter to pin/unpin verts. pinned verts aren't affected by transform,
e.g. grab, rotate, etc. this could probably work nicer for proportional
editing, but that can be done later. also the UI for this probably needs
reviewing and feedback. still, very nice patch by Fabian, something I for one
will probably find very useful :)
Modified Paths:
--
branches/bmesh/blender/source/blender/bmesh/bmesh.h
branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/include/UI_resources.h
branches/bmesh/blender/source/blender/editors/interface/resources.c
branches/bmesh/blender/source/blender/editors/mesh/bmesh_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/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_meshdata_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh.h
===
--- branches/bmesh/blender/source/blender/bmesh/bmesh.h 2009-09-10 03:00:50 UTC
(rev 23102)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh.h 2009-09-10 03:59:12 UTC
(rev 23103)
@@ -109,6 +109,7 @@
#define BM_SMOOTH (1<<5)
#define BM_ACTIVE (1<<6)
#define BM_NONORMCALC (1<<7)
+#define BM_PINNED (1<<8)
typedef struct BMHeader {
struct BMHeader *next, *prev;
Modified: branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h
===
--- branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h 2009-09-10
03:00:50 UTC (rev 23102)
+++ branches/bmesh/blender/source/blender/bmesh/bmesh_marking.h 2009-09-10
03:59:12 UTC (rev 23103)
@@ -8,6 +8,12 @@
void *data;
} BMEditSelection;
+/* pinning code */
+void BM_Pin(BMesh *bm, void *element, int pin);
+void BM_Pin_Vert(BMesh *bm, BMVert *v, int pin);
+void BM_Pin_Edge(BMesh *bm, BMEdge *e, int pin);
+void BM_Pin_Face(BMesh *bm, BMFace *f, int pin);
+
/*geometry hiding code*/
void BM_Hide(BMesh *bm, void *element, int hide);
void BM_Hide_Vert(BMesh *bm, BMVert *v, int hide);
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
===
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
2009-09-10 03:00:50 UTC (rev 23102)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_construct.c
2009-09-10 03:59:12 UTC (rev 23103)
@@ -542,6 +542,7 @@
BMHeader *h = element;
int f = 0;
+ if (h->flag & BM_PINNED) f |= ME_PIN;
if (h->flag & BM_HIDDEN) f |= ME_HIDE;
if (h->type == BM_FACE) {
@@ -571,6 +572,7 @@
*/
int MEFlags_To_BMFlags(int flag, int type) {
int f = 0;
+ if (flag & ME_PIN) f |= BM_PINNED;
if (type == BM_FACE) {
if (flag & ME_FACE_SEL) f |= BM_SELECT;
Modified: branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
===
--- branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
2009-09-10 03:00:50 UTC (rev 23102)
+++ branches/bmesh/blender/source/blender/bmesh/intern/bmesh_marking.c
2009-09-10 03:59:12 UTC (rev 23103)
@@ -532,6 +532,51 @@
}
}
+/* Pinning **/
+
+#define SETPIN(ele) pin ? BM_SetHFlag(ele, BM_PINNED) : BM_ClearHFlag(ele,
BM_PINNED);
+
+
+void BM_Pin_Vert(BMesh *bm, BMVert *v, int pin)
+{
+ SETPIN(v);
+}
+
+void BM_Pin_Edge(BMesh *bm, BMEdge *e, int pin)
+{
+ SETPIN(e->v1);
+ SETPIN(e->v2);
+}
+
+void BM_Pin_Face(BMesh *bm, BMFace *f, int pin)
+{
+ BMIter vfiter;
+ BMVert *vf;
+
+ BM_ITER(vf, &vfiter, bm, BM_VERTS_OF_FACE, f) {
+ SETPIN(vf);
+ }
+}
+
+void BM_Pin(BMesh *bm, void *element, int pin)
+{
+ BMHeader
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23102] branches/blender2.5/blender/source /blender: committing patch #19252-Soft/ Linear Light blend modes+Darken mode bug fix
Revision: 23102
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23102
Author: scourage
Date: 2009-09-10 05:00:50 +0200 (Thu, 10 Sep 2009)
Log Message:
---
committing patch #19252-Soft/Linear Light blend modes+Darken mode bug fix
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/intern/material.c
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
branches/blender2.5/blender/source/blender/makesdna/DNA_material_types.h
branches/blender2.5/blender/source/blender/makesdna/DNA_texture_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c
branches/blender2.5/blender/source/blender/render/intern/source/texture.c
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/material.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/material.c
2009-09-10 02:57:25 UTC (rev 23101)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/material.c
2009-09-10 03:00:50 UTC (rev 23102)
@@ -1031,15 +1031,15 @@
}
break;
case MA_RAMP_DARK:
- tmp= fac*col[0];
- if(tmp < *r) *r= tmp;
- if(g) {
- tmp= fac*col[1];
- if(tmp < *g) *g= tmp;
- tmp= fac*col[2];
- if(tmp < *b) *b= tmp;
- }
- break;
+tmp=col[0]+((1-col[0])*facm);
+if(tmp < *r) *r= tmp;
+if(g) {
+tmp=col[1]+((1-col[1])*facm);
+if(tmp < *g) *g= tmp;
+tmp=col[2]+((1-col[2])*facm);
+if(tmp < *b) *b= tmp;
+}
+break;
case MA_RAMP_LIGHT:
tmp= fac*col[0];
if(tmp > *r) *r= tmp;
@@ -1169,8 +1169,37 @@
}
}
break;
- }
-
+case MA_RAMP_SOFT:
+if (g){
+float scr, scg, scb;
+
+/* first calculate non-fac based Screen mix */
+scr = 1.0 - ((1.0 - col[0])) * (1.0 - *r);
+scg = 1.0 - ((1.0 - col[1])) * (1.0 - *g);
+scb = 1.0 - ((1.0 - col[2])) * (1.0 - *b);
+
+*r = facm*(*r) + fac*(((1.0 - *r) * col[0] * (*r)) + (*r *
scr));
+*g = facm*(*g) + fac*(((1.0 - *g) * col[1] * (*g)) + (*g *
scg));
+*b = facm*(*b) + fac*(((1.0 - *b) * col[2] * (*b)) + (*b *
scb));
+}
+break;
+case MA_RAMP_LINEAR:
+if (col[0] > 0.5)
+*r = *r + fac*(2*(col[0]-0.5));
+else
+*r = *r + fac*(2*(col[0]) - 1);
+if (g){
+if (col[1] > 0.5)
+*g = *g + fac*(2*(col[1]-0.5));
+else
+*g = *g + fac*(2*(col[1]) -1);
+if (col[2] > 0.5)
+*b = *b + fac*(2*(col[2]-0.5));
+else
+*b = *b + fac*(2*(col[2]) - 1);
+}
+break;
+ }
}
Modified:
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
===
--- branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
2009-09-10 02:57:25 UTC (rev 23101)
+++ branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
2009-09-10 03:00:50 UTC (rev 23102)
@@ -247,7 +247,7 @@
/* blend type */
uiBlockBeginAlign(block);
- bt=uiDefButS(block, MENU, B_NODE_EXEC, "Mix %x0|Add
%x1|Subtract %x3|Multiply %x2|Screen %x4|Overlay %x9|Divide %x5|Difference
%x6|Darken %x7|Lighten %x8|Dodge %x10|Burn %x11|Color %x15|Value
%x14|Saturation %x13|Hue %x12",
+ bt=uiDefButS(block, MENU, B_NODE_EXEC, "Mix %x0|Add
%x1|Subtract %x3|Multiply %x2|Screen %x4|Overlay %x9|Divide %x5|Difference
%x6|Darken %x7|Lighten %x8|Dodge %x10|Burn %x11|Color %x15|Value
%x14|Saturation %x13|Hue %x12|Soft Light %x16|Linear Light %x17",
(short)butr->xmin, (short)butr->ymin,
butr->xmax-butr->xmin -(a_but?20:0), 20,
&node->custom1, 0, 0, 0, 0, "");
uiButSetFunc(bt, node_but_title_cb, node, bt);
Modified:
branches/blender2.
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23101] trunk/blender/source/blender: Curve cleanup
Revision: 23101
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23101
Author: campbellbarton
Date: 2009-09-10 04:57:25 +0200 (Thu, 10 Sep 2009)
Log Message:
---
Curve cleanup
Renamed BevPoint's members
* x,y,z -> vec[3]; compatible with other functions.
* f1 -> split_tag; used by displist to set the splitting flag.
* f2 -> dupe_tag; used in curve.c to remove duplicates.
BevList
* flag -> dupe_nr; was being used as a counter for duplicate points.
* use arithb.c functions where possible.
* arrays for coords, tilt and radius were being allocated, then copied into the
BevPoint's, now write directly into the values without allocing/freeing arrays.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_curve.h
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/colortools.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/displist.c
trunk/blender/source/blender/makesdna/DNA_curve_types.h
trunk/blender/source/blender/python/api2_2x/Geometry.c
trunk/blender/source/blender/src/drawipo.c
trunk/blender/source/blender/src/drawobject.c
Modified: trunk/blender/source/blender/blenkernel/BKE_curve.h
===
--- trunk/blender/source/blender/blenkernel/BKE_curve.h 2009-09-10 01:55:10 UTC
(rev 23100)
+++ trunk/blender/source/blender/blenkernel/BKE_curve.h 2009-09-10 02:57:25 UTC
(rev 23101)
@@ -70,7 +70,7 @@
void makeknots( struct Nurb *nu, short uv);
void makeNurbfaces(struct Nurb *nu, float *coord_array, int rowstride);
-void makeNurbcurve(struct Nurb *nu, float *coord_array, float *tilt_array,
float *radius_array, int resolu);
+void makeNurbcurve(struct Nurb *nu, float *coord_array, float *tilt_array,
float *radius_array, int resolu, int stride);
void forward_diff_bezier(float q0, float q1, float q2, float q3, float *p, int
it, int stride);
float *make_orco_curve( struct Object *ob);
float *make_orco_surf( struct Object *ob);
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2009-09-10
01:55:10 UTC (rev 23100)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2009-09-10
02:57:25 UTC (rev 23101)
@@ -86,11 +86,11 @@
void calc_curvepath(Object *ob)
{
BevList *bl;
- BevPoint *bevp, *bevpn, *bevpfirst, *bevplast, *tempbevp;
+ BevPoint *bevp, *bevpn, *bevpfirst, *bevplast;
Curve *cu;
Nurb *nu;
Path *path;
- float *fp, *dist, *maxdist, x, y, z;
+ float *fp, *dist, *maxdist, xyz[3];
float fac, d=0, fac1, fac2;
int a, tot, cycl=0;
float *ft;
@@ -129,19 +129,12 @@
*fp= 0;
for(a=0; ax - bevp->x;
- y= bevpfirst->y - bevp->y;
- z= bevpfirst->z - bevp->z;
- }
- else {
-tempbevp = bevp+1;
- x= (tempbevp)->x - bevp->x;
- y= (tempbevp)->y - bevp->y;
- z= (tempbevp)->z - bevp->z;
- }
- *fp= *(fp-1)+ (float)sqrt(x*x+y*y+z*z);
+ if(cycl && a==tot-1)
+ VecSubf(xyz, bevpfirst->vec, bevp->vec);
+ else
+ VecSubf(xyz, (bevp+1)->vec, bevp->vec);
+ *fp= *(fp-1)+VecLength(xyz);
bevp++;
}
@@ -178,14 +171,11 @@
fac2= *(fp)-d;
fac1= fac2/fac1;
fac2= 1.0f-fac1;
-
- ft[0]= fac1*bevp->x+ fac2*(bevpn)->x;
- ft[1]= fac1*bevp->y+ fac2*(bevpn)->y;
- ft[2]= fac1*bevp->z+ fac2*(bevpn)->z;
+
+ VecLerpf(ft, bevp->vec, bevpn->vec, fac2);
ft[3]= fac1*bevp->alfa+ fac2*(bevpn)->alfa;
ft+= 4;
-
}
MEM_freeN(dist);
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2009-09-10
01:55:10 UTC (rev 23100)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2009-09-10
02:57:25 UTC (rev 23101)
@@ -654,10 +654,10 @@
if(bone->segments > MAX_BBONE_SUBDIV)
bone->segments= MAX_BBONE_SUBDIV;
- forward_diff_bezier(0.0, h1[0], h2[0], 0.0,
data[0],MAX_BBONE_SUBDIV, 4);
- forward_diff_bezier(0.0, h1[1], length + h2[1], length,
data[0]+1, MAX_BBONE_SUBDIV, 4);
- forward_diff_bezier(0.0,
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23100] branches/blender2.5/blender/ release/windows: Inno installer script to build windows installer.
Revision: 23100
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23100
Author: scourage
Date: 2009-09-10 03:55:10 +0200 (Thu, 10 Sep 2009)
Log Message:
---
Inno installer script to build windows installer. First draft-still needs some
work. Creates a baseline functional installer from a build. Requires Inno and
Inno ISTool
Added Paths:
---
branches/blender2.5/blender/release/windows/inno/
branches/blender2.5/blender/release/windows/inno/blender.iss
branches/blender2.5/blender/release/windows/inno/copyright.txt
branches/blender2.5/blender/release/windows/inno/header.bmp
branches/blender2.5/blender/release/windows/inno/installer.bmp
branches/blender2.5/blender/release/windows/inno/installer.ico
Added: branches/blender2.5/blender/release/windows/inno/blender.iss
===
--- branches/blender2.5/blender/release/windows/inno/blender.iss
(rev 0)
+++ branches/blender2.5/blender/release/windows/inno/blender.iss
2009-09-10 01:55:10 UTC (rev 23100)
@@ -0,0 +1,92 @@
+; Script generated by the Inno Setup Script Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+
+[Setup]
+#define VERSION "2.49b"
+
+; NOTE: The value of AppId uniquely identifies this application.
+; Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{C45CB76D-AD5F-49CC-86DE-72B168A6A888}
+AppName=Blender
+AppVerName=Blender {#VERSION}
+AppPublisher=Blender Foundation
+AppPublisherURL=http://www.blender.org
+AppSupportURL=http://www.blender.org
+AppUpdatesURL=http://www.blender.org
+DefaultDirName={pf}\Blender
+DefaultGroupName=Blender Foundation
+AllowNoIcons=true
+LicenseFile=.\copyright.txt
+OutputBaseFilename=blender-{#VERSION}
+Compression=lzma
+SolidCompression=true
+ChangesAssociations=true
+WizardImageFile=.\installer.bmp
+WizardSmallImageFile=.\header.bmp
+SetupIconFile=.\installer.ico
+MinVersion=,5.01.2600sp1
+PrivilegesRequired=none
+AllowRootDirectory=true
+ShowLanguageDialog=auto
+
+[Dirs]
+Name: {userdocs}\Blender; Flags: uninsneveruninstall; Tasks: ; Languages:
+
+[Languages]
+Name: english; MessagesFile: compiler:Default.isl
+
+[Tasks]
+Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription:
{cm:AdditionalIcons}; Flags: unchecked
+Name: quicklaunchicon; Description: {cm:CreateQuickLaunchIcon};
GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
+
+[Files]
+Source: ..\..\..\..\build\bin\release\blender.exe; DestDir: {app}; Flags:
ignoreversion
+Source: ..\..\..\..\build\bin\release\blender.html; DestDir: {app}; Flags:
ignoreversion
+Source: ..\..\..\..\build\bin\release\BlenderQuickStart.pdf; DestDir: {app};
Flags: ignoreversion
+Source: ..\..\..\..\build\bin\release\copyright.txt; DestDir: {app}; Flags:
ignoreversion
+Source: ..\..\..\..\build\bin\release\GPL-license.txt; DestDir: {app}; Flags:
ignoreversion
+Source: ..\..\..\..\build\bin\release\Python-license.txt; DestDir: {app};
Flags: ignoreversion
+Source: ..\..\..\..\build\bin\release\release_249.txt; DestDir: {app}; Flags:
ignoreversion
+Source: ..\..\..\..\build\bin\release\*.dll; DestDir: {app}; Flags:
ignoreversion
+Source: ..\..\..\..\build\bin\release\plugins\*; DestDir: {app}; Flags:
ignoreversion recursesubdirs createallsubdirs
+Source: ..\..\..\..\build\bin\release\.blender\*; DestDir: {app}; Flags:
ignoreversion recursesubdirs createallsubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Icons]
+Name: {group}\Blender; Filename: {app}\blender.exe
+Name: {group}\ReleaseNotes; Filename: {app}\release_249.txt
+Name: {group}\Blender.org; Filename: {app}\blender.html
+Name: {group}\Copyright; Filename: {app}\copyright.txt
+Name: {group}\GPL; Filename: {app}\GPL-license.txt
+Name: {group}\Uninstall; Filename: {uninstallexe}; Tasks: ; Languages:
+Name: {commondesktop}\Blender; Filename: {app}\blender.exe; Tasks: desktopicon
+Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Blender;
Filename: {app}\blender.exe; Tasks: quicklaunchicon
+
+[Registry]
+Root: HKCR; Subkey: .blend; ValueType: string; ValueName: ; ValueData:
BlenderFile; Flags: uninsdeletevalue
+Root: HKCR; Subkey: BlenderFile; ValueType: string; ValueName: ; ValueData:
Blender File; Flags: uninsdeletekey
+Root: HKCR; Subkey: BlenderFile\DefaultIcon; ValueType: string; ValueName: ;
ValueData: {app}\blender.exe,0
+Root: HKCR; Subkey: BlenderFile\shell\open\command; ValueType: string;
ValueName: ; ValueData: """{app}\blender.exe"" ""%1"""
+
+[Run]
+Filename: {app}\blender.exe; Description: {cm:LaunchProgram,Blender}; Flags:
nowait postinstall skipifsilent
+
+
+[_ISToolDownload]
+
+[UninstallDelete]
+Name: {app}\blender.exe; Type: files
+Name: {app}\*.dll; Type: files
+Name: {app}\blender.html; Type: files; Ta
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23099] branches/bmesh/blender/source/ blender: another optimization pass.
Revision: 23099 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23099 Author: joeedh Date: 2009-09-10 03:46:52 +0200 (Thu, 10 Sep 2009) Log Message: --- another optimization pass. biggest change is MDeformGroup->dw is now allocated via a somewhat simplistic, if effective allocator. This needs a little bit more work; I'd really prefer building this into guardedalloc, but the method requires mempools, which currently live in blenlib. and I'm not sure if we can have guardedalloc linking with blenlib? anyway, current allocator code is more of a temporary fix until I figure that out. Modified Paths: -- branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c branches/bmesh/blender/source/blender/blenkernel/intern/armature.c branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c branches/bmesh/blender/source/blender/blenkernel/intern/deform.c branches/bmesh/blender/source/blender/blenkernel/intern/editderivedbmesh.c branches/bmesh/blender/source/blender/blenkernel/intern/key.c branches/bmesh/blender/source/blender/blenkernel/intern/lattice.c branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c branches/bmesh/blender/source/blender/blenkernel/intern/modifier.c branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c branches/bmesh/blender/source/blender/blenkernel/intern/particle.c branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c branches/bmesh/blender/source/blender/blenlib/intern/BLI_mempool.c branches/bmesh/blender/source/blender/blenloader/intern/readfile.c branches/bmesh/blender/source/blender/bmesh/intern/bmesh_mesh.c branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c branches/bmesh/blender/source/blender/editors/object/object_vgroup.c branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c Added Paths: --- branches/bmesh/blender/source/blender/blenlib/BLI_cellalloc.h branches/bmesh/blender/source/blender/blenlib/intern/BLI_cellalloc.c Modified: branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c === --- branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c 2009-09-10 01:14:21 UTC (rev 23098) +++ branches/bmesh/blender/source/blender/blenkernel/intern/BME_tools.c 2009-09-10 01:46:52 UTC (rev 23099) @@ -44,6 +44,7 @@ #include "BKE_bmesh.h" #include "BLI_arithb.h" #include "BLI_blenlib.h" +#include "BLI_cellalloc.h" /*split this all into a seperate bevel.c file in src*/ Modified: branches/bmesh/blender/source/blender/blenkernel/intern/armature.c === --- branches/bmesh/blender/source/blender/blenkernel/intern/armature.c 2009-09-10 01:14:21 UTC (rev 23098) +++ branches/bmesh/blender/source/blender/blenkernel/intern/armature.c 2009-09-10 01:46:52 UTC (rev 23099) @@ -38,6 +38,7 @@ #include "BLI_arithb.h" #include "BLI_blenlib.h" +#include "BLI_cellalloc.h" #include "DNA_armature_types.h" #include "DNA_action_types.h" Modified: branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c === --- branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c 2009-09-10 01:14:21 UTC (rev 23098) +++ branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c 2009-09-10 01:46:52 UTC (rev 23099) @@ -48,6 +48,7 @@ #include "BKE_pointcache.h" #include "BLI_kdopbvh.h" +#include "BLI_cellalloc.h" #ifdef _WIN32 void tstart ( void ) Modified: branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c === --- branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c 2009-09-10 01:14:21 UTC (rev 23098) +++ branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c 2009-09-10 01:46:52 UTC (rev 23099) @@ -38,6 +38,7 @@ #include "BLI_blenlib.h" #include "BLI_arithb.h" #include "BLI_editVert.h" +#include "BLI_cellalloc.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" Modified: branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c === --- branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2009-09-10 01:14:21 UTC (rev 23098) +++ branches/bmesh/blender/source/blender/blenkernel/intern/customdata.c 2009-09-10 01:46:52 UTC (rev 23099) @@ -38,6 +38,7 @@ #include "BLI_blenlib.h" #include "BLI_linklist.h" #include "BLI_mempool.h"
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23098] branches/blender2.5/blender/source /blender/makesrna/intern/rna_nodetree.c: 2.5 Node RNA:
Revision: 23098 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23098 Author: dingto Date: 2009-09-10 03:14:21 +0200 (Thu, 10 Sep 2009) Log Message: --- 2.5 Node RNA: * Added Property ranges for Nodes. Modified Paths: -- branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c === --- branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c 2009-09-10 00:32:59 UTC (rev 23097) +++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c 2009-09-10 01:14:21 UTC (rev 23098) @@ -396,6 +396,7 @@ prop = RNA_def_property(srna, "premul", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "x"); + RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Premul", "Mix Factor"); } @@ -419,38 +420,46 @@ prop = RNA_def_property(srna, "sizex", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "sizex"); + RNA_def_property_range(prop, 0, 256); RNA_def_property_ui_text(prop, "Size X", ""); prop = RNA_def_property(srna, "sizey", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "sizey"); + RNA_def_property_range(prop, 1, 256); RNA_def_property_ui_text(prop, "Size Y", ""); prop = RNA_def_property(srna, "samples", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "samples"); + RNA_def_property_range(prop, 1, 256); RNA_def_property_ui_text(prop, "Samples", ""); prop = RNA_def_property(srna, "max_speed", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "maxspeed"); + RNA_def_property_range(prop, 1, 1024); RNA_def_property_ui_text(prop, "Max Speed", ""); prop = RNA_def_property(srna, "min_speed", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "minspeed"); + RNA_def_property_range(prop, 1, 1024); RNA_def_property_ui_text(prop, "Min Speed", ""); - + prop = RNA_def_property(srna, "relative", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "relative", 1); RNA_def_property_ui_text(prop, "Relative", ""); prop = RNA_def_property(srna, "factor", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "fac"); + RNA_def_property_range(prop, 0.0f, 2.0f); RNA_def_property_ui_text(prop, "Factor", ""); prop = RNA_def_property(srna, "factor_x", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "percentx"); + RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Relative Size X", ""); prop = RNA_def_property(srna, "factor_y", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "percenty"); + RNA_def_property_range(prop, 0.0f, 1.0f); RNA_def_property_ui_text(prop, "Relative Size Y", ""); prop = RNA_def_property(srna, "filter_type", PROP_ENUM, PROP_NONE); @@ -506,10 +515,12 @@ prop = RNA_def_property(srna, "offset", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "loc"); + RNA_def_property_range(prop, -1000.0f, 1000.0f); RNA_def_property_ui_text(prop, "Offset", ""); prop = RNA_def_property(srna, "size", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "size"); + RNA_def_property_range(prop, -1000.0f, 1000.0f); RNA_def_property_ui_text(prop, "Size", ""); prop = RNA_def_property(srna, "use_min", PROP_BOOLEAN, PROP_NONE); @@ -522,10 +533,12 @@ prop = RNA_def_property(srna, "min", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "min"); + RNA_def_property_range(prop, -1000.0f, 1000.0f); RNA_def_property_ui_text(prop, "Minimum", ""); prop = RNA_def_property(srna, "max", PROP_FLOAT, PROP_NONE); RNA_def_property_float_sdna(prop, NULL, "max"); + RNA_def_property_range(prop, -1000.0f, 1000.0f); RNA_def_property_ui_text(prop, "Maximum", ""); } @@ -580,14 +593,17 @@ prop = RNA_def_property(srna, "frames", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "frames"); + RNA_def_property_range(prop, 1, MAXFRAMEF); RNA_def_property_ui_text(prop, "Frames", "Number of images used in animation"); prop = RNA_def_property(srna, "start", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "sfra"); + RNA_def_property_range(prop, 1, MAXFRAMEF); RNA_def_property_ui_text(prop, "Start Frame", ""); prop = RNA
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23097] branches/blender2.5/blender/source /Makefile: Remove smoke from COMLIB, already in PULIB.
Revision: 23097 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23097 Author: gsrb3d Date: 2009-09-10 02:32:59 +0200 (Thu, 10 Sep 2009) Log Message: --- Remove smoke from COMLIB, already in PULIB. Modified Paths: -- branches/blender2.5/blender/source/Makefile Modified: branches/blender2.5/blender/source/Makefile === --- branches/blender2.5/blender/source/Makefile 2009-09-09 23:52:48 UTC (rev 23096) +++ branches/blender2.5/blender/source/Makefile 2009-09-10 00:32:59 UTC (rev 23097) @@ -113,7 +113,6 @@ COMLIB += $(NAN_SAMPLERATE)/lib/$(DEBUG_DIR)libsamplerate.a COMLIB += $(NAN_LZO)/lib/$(DEBUG_DIR)libminilzo.a COMLIB += $(NAN_LZMA)/lib/$(DEBUG_DIR)liblzma.a -COMLIB += $(NAN_SMOKE)/lib/$(DEBUG_DIR)/libsmoke.a ifeq ($(WITH_FFMPEG),true) COMLIB += $(NAN_AUDASPACE)/lib/$(DEBUG_DIR)libaud_ffmpeg.a ___ 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 [23096] branches/blender2.5/blender: Smoke :
Revision: 23096
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23096
Author: genscher
Date: 2009-09-10 01:52:48 +0200 (Thu, 10 Sep 2009)
Log Message:
---
Smoke:
* Bugfix for non-working high res display
* Bugfix for smoke disappearing on 2nd frame
Modified Paths:
--
branches/blender2.5/blender/release/ui/buttons_physics_smoke.py
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
Modified: branches/blender2.5/blender/release/ui/buttons_physics_smoke.py
===
--- branches/blender2.5/blender/release/ui/buttons_physics_smoke.py
2009-09-09 23:11:43 UTC (rev 23095)
+++ branches/blender2.5/blender/release/ui/buttons_physics_smoke.py
2009-09-09 23:52:48 UTC (rev 23096)
@@ -90,7 +90,10 @@
def poll(self, context):
md = context.smoke
- return md and (md.smoke_type == 'TYPE_DOMAIN')
+ if md:
+ return (md.smoke_type == 'TYPE_DOMAIN')
+
+ return False
def draw(self, context):
layout = self.layout
@@ -145,7 +148,7 @@
md = context.smoke.domain_settings
split = layout.split()
-
+
col = split.column()
col.itemL(text="Resolution:")
col.itemR(md, "amplify", text="Divisions")
@@ -154,7 +157,7 @@
col.itemL(text="Noise Method:")
col.row().itemR(md, "noise_type", text="")
col.itemR(md, "strength")
- sub.itemR(md, "viewhighres")
+ col.itemR(md, "viewhighres")
class PHYSICS_PT_smoke_cache_highres(PhysicButtonsPanel):
__label__ = "Smoke High Resolution Cache"
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
2009-09-09 23:11:43 UTC (rev 23095)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
2009-09-09 23:52:48 UTC (rev 23096)
@@ -1847,7 +1847,7 @@
else if(pid->type == PTCACHE_TYPE_SMOKE_DOMAIN)
smokeModifier_reset(pid->calldata);
else if(pid->type == PTCACHE_TYPE_SMOKE_HIGHRES)
- smokeModifier_reset(pid->calldata);
+ smokeModifier_reset_turbulence(pid->calldata);
}
if(clear)
BKE_ptcache_id_clear(pid, PTCACHE_CLEAR_ALL, 0);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
2009-09-09 23:11:43 UTC (rev 23095)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
2009-09-09 23:52:48 UTC (rev 23096)
@@ -1157,14 +1157,13 @@
{
BKE_ptcache_id_reset(scene, &pid,
PTCACHE_RESET_OUTDATED);
}
- if(!(cache_wt->flag & PTCACHE_SIMULATION_VALID))
+ if(sds->wt && !(cache_wt->flag & PTCACHE_SIMULATION_VALID))
{
BKE_ptcache_id_reset(scene, &pid_wt,
PTCACHE_RESET_OUTDATED);
}
if(smd->time == -1 && framenr!= startframe)
return;
-
if(!smokeModifier_init(smd, ob, scene, dm))
return;
@@ -1287,6 +1286,7 @@
if(get_lamp(scene, light))
smoke_calc_transparency(sds->shadow,
smoke_get_density(sds->fluid), sds->p0, sds->p1, sds->res, sds->dx, light,
calc_voxel_transp, -7.0*sds->dx);
+ // printf("smd->time: %f\n", smd->time);
return;
}
___
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 [23095] branches/blender2.5/blender/source /blender/editors: - off by 1 error with console command line memory re-allocation.
Revision: 23095
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23095
Author: campbellbarton
Date: 2009-09-10 01:11:43 +0200 (Thu, 10 Sep 2009)
Log Message:
---
- off by 1 error with console command line memory re-allocation.
- documenting vgroups crashed.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c
branches/blender2.5/blender/source/blender/editors/space_console/console_ops.c
Modified:
branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c
===
--- branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c
2009-09-09 20:56:49 UTC (rev 23094)
+++ branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c
2009-09-09 23:11:43 UTC (rev 23095)
@@ -1230,13 +1230,13 @@
static EnumPropertyItem *vgroup_itemf(bContext *C, PointerRNA *ptr, int *free)
{
- Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+ Object *ob;
EnumPropertyItem tmp = {0, "", 0, "", ""};
EnumPropertyItem *item= NULL;
bDeformGroup *def;
int a, totitem= 0;
- if(!C) /* needed for docs */
+ if(!C || !(ob = CTX_data_pointer_get_type(C, "object",
&RNA_Object).data)) /* needed for docs */
return vgroup_items;
for(a=0, def=ob->defbase.first; def; def=def->next, a++) {
Modified:
branches/blender2.5/blender/source/blender/editors/space_console/console_ops.c
===
---
branches/blender2.5/blender/source/blender/editors/space_console/console_ops.c
2009-09-09 20:56:49 UTC (rev 23094)
+++
branches/blender2.5/blender/source/blender/editors/space_console/console_ops.c
2009-09-09 23:11:43 UTC (rev 23095)
@@ -190,7 +190,7 @@
static void console_line_verify_length(ConsoleLine *ci, int len)
{
/* resize the buffer if needed */
- if(len > ci->len_alloc) {
+ if(len >= ci->len_alloc) {
int new_len= len * 2; /* new length */
char *new_line= MEM_callocN(new_len, "console line");
memcpy(new_line, ci->line, ci->len);
___
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 [23094] branches/blender2.5/blender/ release/io/netrender: support for external images, blacklisting slaves on errors and proper job termination on ca
Revision: 23094
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23094
Author: theeth
Date: 2009-09-09 22:56:49 +0200 (Wed, 09 Sep 2009)
Log Message:
---
support for external images, blacklisting slaves on errors and proper job
termination on cancel
Modified Paths:
--
branches/blender2.5/blender/release/io/netrender/client.py
branches/blender2.5/blender/release/io/netrender/master.py
branches/blender2.5/blender/release/io/netrender/slave.py
Modified: branches/blender2.5/blender/release/io/netrender/client.py
===
--- branches/blender2.5/blender/release/io/netrender/client.py 2009-09-09
19:59:52 UTC (rev 23093)
+++ branches/blender2.5/blender/release/io/netrender/client.py 2009-09-09
20:56:49 UTC (rev 23094)
@@ -26,6 +26,9 @@
if job_name == "[default]":
job_name = name
+ ###
+ # LIBRARIES
+ ###
for lib in bpy.data.libraries:
lib_path = lib.filename
@@ -34,11 +37,13 @@
job.addFile(lib_path)
+ ###
+ # POINT CACHES
+ ###
+
root, ext = os.path.splitext(name)
cache_path = path + os.sep + "blendcache_" + root + os.sep # need an
API call for that
- print("cache:", cache_path)
-
if os.path.exists(cache_path):
caches = {}
pattern = re.compile("([a-zA-Z0-9]+)_([0-9]+)_[0-9]+\.bphys")
@@ -80,8 +85,15 @@
previous_frame =
previous_item[0]
job.addFile(cache_path +
current_file, previous_frame + 1, next_frame - 1)
- print(job.files)
+ ###
+ # IMAGES
+ ###
+ for image in bpy.data.images:
+ if image.source == "FILE" and not image.packed_file:
+ job.addFile(image.filename)
+ # print(job.files)
+
job.name = job_name
for slave in scene.network_render.slaves_blacklist:
Modified: branches/blender2.5/blender/release/io/netrender/master.py
===
--- branches/blender2.5/blender/release/io/netrender/master.py 2009-09-09
19:59:52 UTC (rev 23093)
+++ branches/blender2.5/blender/release/io/netrender/master.py 2009-09-09
20:56:49 UTC (rev 23094)
@@ -477,33 +477,43 @@
print("writing result file")
self.server.stats("", "Receiving render result")
- job_id = self.headers['job-id']
+ slave_id = self.headers['slave-id']
- job = self.server.getJobByID(job_id)
+ slave = self.server.updateSlave(slave_id)
- if job:
- job_frame = int(self.headers['job-frame'])
- job_result = int(self.headers['job-result'])
- job_time = float(self.headers['job-time'])
+ if slave: # only if slave id is valid
+ job_id = self.headers['job-id']
- if job_result == DONE:
- length =
int(self.headers['content-length'])
- buf = self.rfile.read(length)
- f = open(job.save_path + "%04d" %
job_frame + ".exr", 'wb')
- f.write(buf)
- f.close()
+ job = self.server.getJobByID(job_id)
+
+ if job:
+ job_frame =
int(self.headers['job-frame'])
+ job_result =
int(self.headers['job-result'])
+ job_time =
float(self.headers['job-time'])
- del buf
+ frame = job[job_frame]
- job = self.server.getJobByID(job_id)
- frame = job[job_frame]
- frame.status = job_result
- frame.time = job_time
-
-
self.server.updateSlave(self.headers['slave-id'])
-
- self.send_head()
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23093] branches/blender2.5/blender/source /blender/makesrna/intern/makesrna.c: RNA: fix for last commit, 0 size arrays are not very useful..
Revision: 23093
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23093
Author: blendix
Date: 2009-09-09 21:59:52 +0200 (Wed, 09 Sep 2009)
Log Message:
---
RNA: fix for last commit, 0 size arrays are not very useful..
Modified Paths:
--
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2009-09-09 19:52:10 UTC (rev 23092)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2009-09-09 19:59:52 UTC (rev 23093)
@@ -1679,7 +1679,7 @@
BooleanPropertyRNA *bprop=
(BooleanPropertyRNA*)prop;
unsigned int i;
- if(prop->arraydimension) {
+ if(prop->arraydimension &&
prop->totarraylength) {
fprintf(f, "static int
rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier,
prop->totarraylength);
for(i=0; itotarraylength; i++) {
@@ -1699,7 +1699,7 @@
IntPropertyRNA *iprop= (IntPropertyRNA*)prop;
unsigned int i;
- if(prop->arraydimension) {
+ if(prop->arraydimension &&
prop->totarraylength) {
fprintf(f, "static int
rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier,
prop->totarraylength);
for(i=0; itotarraylength; i++) {
@@ -1719,7 +1719,7 @@
FloatPropertyRNA *fprop=
(FloatPropertyRNA*)prop;
unsigned int i;
- if(prop->arraydimension) {
+ if(prop->arraydimension &&
prop->totarraylength) {
fprintf(f, "static float
rna_%s%s_%s_default[%d] = {", srna->identifier, strnest, prop->identifier,
prop->totarraylength);
for(i=0; itotarraylength; i++) {
@@ -1762,7 +1762,7 @@
case PROP_BOOLEAN: {
BooleanPropertyRNA *bprop=
(BooleanPropertyRNA*)prop;
fprintf(f, "\t%s, %s, %s, %s, %d, ",
rna_function_string(bprop->get), rna_function_string(bprop->set),
rna_function_string(bprop->getarray), rna_function_string(bprop->setarray),
bprop->defaultvalue);
- if(prop->arraydimension) fprintf(f,
"rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+ if(prop->arraydimension &&
prop->totarraylength) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier,
strnest, prop->identifier);
else fprintf(f, "NULL\n");
break;
}
@@ -1775,7 +1775,7 @@
rna_int_print(f, iprop->hardmax); fprintf(f, ",
");
rna_int_print(f, iprop->step); fprintf(f, ", ");
rna_int_print(f, iprop->defaultvalue);
fprintf(f, ", ");
- if(prop->arraydimension) fprintf(f,
"rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+ if(prop->arraydimension &&
prop->totarraylength) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier,
strnest, prop->identifier);
else fprintf(f, "NULL\n");
break;
}
@@ -1789,7 +1789,7 @@
rna_float_print(f, fprop->step); fprintf(f, ",
");
rna_int_print(f, (int)fprop->precision);
fprintf(f, ", ");
rna_float_print(f, fprop->defaultvalue);
fprintf(f, ", ");
- if(prop->arraydimension) fprintf(f,
"rna_%s%s_%s_default\n", srna->identifier, strnest, prop->identifier);
+ if(prop->arraydimension &&
prop->totarraylength) fprintf(f, "rna_%s%s_%s_default\n", srna->identifier,
strnest, prop->identifier);
else fprintf(f, "NULL\n");
break;
}
___
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 [23092] branches/blender2.5/blender/ release/ui/buttons_physics_smoke.py: * Small code cleanup.
Revision: 23092 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23092 Author: dingto Date: 2009-09-09 21:52:10 +0200 (Wed, 09 Sep 2009) Log Message: --- * Small code cleanup. Modified Paths: -- branches/blender2.5/blender/release/ui/buttons_physics_smoke.py Modified: branches/blender2.5/blender/release/ui/buttons_physics_smoke.py === --- branches/blender2.5/blender/release/ui/buttons_physics_smoke.py 2009-09-09 19:43:42 UTC (rev 23091) +++ branches/blender2.5/blender/release/ui/buttons_physics_smoke.py 2009-09-09 19:52:10 UTC (rev 23092) @@ -90,10 +90,7 @@ def poll(self, context): md = context.smoke - if md: - return (md.smoke_type == 'TYPE_DOMAIN') - - return False + return md and (md.smoke_type == 'TYPE_DOMAIN') def draw(self, context): layout = self.layout ___ 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 [23091] branches/blender2.5/blender/ release/ui/buttons_data_empty.py: 2.5: small text tweak for empty object buttons.
Revision: 23091 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23091 Author: blendix Date: 2009-09-09 21:43:42 +0200 (Wed, 09 Sep 2009) Log Message: --- 2.5: small text tweak for empty object buttons. Modified Paths: -- branches/blender2.5/blender/release/ui/buttons_data_empty.py Modified: branches/blender2.5/blender/release/ui/buttons_data_empty.py === --- branches/blender2.5/blender/release/ui/buttons_data_empty.py 2009-09-09 19:43:05 UTC (rev 23090) +++ branches/blender2.5/blender/release/ui/buttons_data_empty.py 2009-09-09 19:43:42 UTC (rev 23091) @@ -17,7 +17,7 @@ ob = context.object - layout.itemR(ob, "empty_draw_type") - layout.itemR(ob, "empty_draw_size") + layout.itemR(ob, "empty_draw_type", text="Draw Type") + layout.itemR(ob, "empty_draw_size", text="Draw Size") bpy.types.register(DATA_PT_empty) ___ 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 [23090] branches/blender2.5/blender/source /blender: Keyboard shortcuts
Revision: 23090
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23090
Author: billrey
Date: 2009-09-09 21:43:05 +0200 (Wed, 09 Sep 2009)
Log Message:
---
Keyboard shortcuts
Made Mac-specific keys only appear on the Mac. This has the added benefit that
it shows the Mac key shortcuts in menus.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/space_console/space_console.c
branches/blender2.5/blender/source/blender/editors/space_text/space_text.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_wm.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2009-09-09 19:42:53 UTC (rev 23089)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
2009-09-09 19:43:05 UTC (rev 23090)
@@ -3327,8 +3327,11 @@
WM_keymap_add_item(keymap, "SCREEN_OT_region_foursplit", SKEY,
KM_PRESS, KM_CTRL|KM_ALT|KM_SHIFT, 0);
WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_history", F3KEY,
KM_PRESS, 0, 0);
+ #ifdef __APPLE__
+ WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS,
KM_OSKEY, 0);
+ #endif
WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS,
KM_CTRL, 0);
- WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS,
KM_OSKEY, 0);//Mac Exception
+
WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0,
0);
WM_keymap_verify_item(keymap, "SCREEN_OT_redo_last", F6KEY, KM_PRESS,
0, 0);
@@ -3340,10 +3343,13 @@
WM_keymap_add_item(keymap, "FILE_OT_cancel", ESCKEY, KM_PRESS, 0, 0);
/* undo */
+ #ifdef __APPLE__
+ WM_keymap_add_item(keymap, "ED_OT_undo", ZKEY, KM_PRESS, KM_OSKEY, 0);
+ WM_keymap_add_item(keymap, "ED_OT_redo", ZKEY, KM_PRESS,
KM_SHIFT|KM_OSKEY, 0);
+ #endif
WM_keymap_add_item(keymap, "ED_OT_undo", ZKEY, KM_PRESS, KM_CTRL, 0);
- WM_keymap_add_item(keymap, "ED_OT_undo", ZKEY, KM_PRESS, KM_OSKEY, 0);
WM_keymap_add_item(keymap, "ED_OT_redo", ZKEY, KM_PRESS,
KM_SHIFT|KM_CTRL, 0);
- WM_keymap_add_item(keymap, "ED_OT_redo", ZKEY, KM_PRESS,
KM_SHIFT|KM_OSKEY, 0);
+
/* render */
WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, 0, 0);
@@ -3352,9 +3358,12 @@
WM_keymap_add_item(keymap, "SCREEN_OT_render_view_show", F11KEY,
KM_PRESS, 0, 0);
/* user prefs */
+ #ifdef __APPLE__
+ WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY,
KM_PRESS, KM_OSKEY, 0);
+ #endif
WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY,
KM_PRESS, KM_CTRL, 0);
- WM_keymap_add_item(keymap, "SCREEN_OT_userpref_show", COMMAKEY,
KM_PRESS, KM_OSKEY, 0);
+
/* Anim Playback */
keymap= WM_keymap_listbase(wm, "Frames", 0, 0);
Modified:
branches/blender2.5/blender/source/blender/editors/space_console/space_console.c
===
---
branches/blender2.5/blender/source/blender/editors/space_console/space_console.c
2009-09-09 19:42:53 UTC (rev 23089)
+++
branches/blender2.5/blender/source/blender/editors/space_console/space_console.c
2009-09-09 19:43:05 UTC (rev 23090)
@@ -233,15 +233,14 @@
{
ListBase *keymap= WM_keymap_listbase(wm, "Console", SPACE_CONSOLE, 0);
- /*
+ #ifdef __APPLE__
RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move",
LEFTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
- RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", ENDKEY,
KM_PRESS, 0, 0)->ptr, "type", LINE_END);
- RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move",
RIGHTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_BEGIN);
+ RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move",
RIGHTARROWKEY, KM_PRESS, KM_OSKEY, 0)->ptr, "type", LINE_END);
+ #endif
+
+ RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move",
LEFTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_BEGIN);
+ RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move",
RIGHTARROWKEY, KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_END);
- RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", EKEY,
KM_PRESS, KM_CTRL, 0)->ptr, "type", LINE_END);
- RNA_enum_set(WM_keymap_add_item(keymap, "CONSOLE_OT_move", EKEY,
KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "type", L
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23089] branches/blender2.5/blender/source /blender/gpu/intern/Makefile: 2.5: fix compilation of smoke commit for Makesfiles as well.
Revision: 23089 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23089 Author: blendix Date: 2009-09-09 21:42:53 +0200 (Wed, 09 Sep 2009) Log Message: --- 2.5: fix compilation of smoke commit for Makesfiles as well. Modified Paths: -- branches/blender2.5/blender/source/blender/gpu/intern/Makefile Modified: branches/blender2.5/blender/source/blender/gpu/intern/Makefile === --- branches/blender2.5/blender/source/blender/gpu/intern/Makefile 2009-09-09 19:40:46 UTC (rev 23088) +++ branches/blender2.5/blender/source/blender/gpu/intern/Makefile 2009-09-09 19:42:53 UTC (rev 23089) @@ -47,6 +47,7 @@ CPPFLAGS += -I../../makesdna CPPFLAGS += -I../../imbuf CPPFLAGS += -I../../blenkernel +CPPFLAGS += -I$(NAN_SMOKE)/include CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I../ ___ 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 [23088] branches/blender2.5/blender/source /blender: RNA: multidimensional & dyanmic array changes
Revision: 23088 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23088 Author: blendix Date: 2009-09-09 21:40:46 +0200 (Wed, 09 Sep 2009) Log Message: --- RNA: multidimensional & dyanmic array changes * Disable setting array length of dynamic array for now, this was not implemented correct, and it's not really needed now. * Allow all dimensions to be dynamic size, not just the first. * Change storage of multidimensional to be simpler. * Rename API functions to be more compact. * Fix some bugs in the implementation. * RenderLayer.rect and RenderPass.rect use a multidimensional dynamic array now. Modified Paths: -- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h branches/blender2.5/blender/source/blender/makesrna/RNA_define.h branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal_types.h branches/blender2.5/blender/source/blender/makesrna/intern/rna_mesh.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_render.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.c branches/blender2.5/blender/source/blender/python/intern/bpy_array.c branches/blender2.5/blender/source/blender/python/intern/bpy_rna.c Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h === --- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2009-09-09 19:31:43 UTC (rev 23087) +++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h 2009-09-09 19:40:46 UTC (rev 23088) @@ -586,10 +586,9 @@ int RNA_property_flag(PropertyRNA *prop); int RNA_property_array_length(PointerRNA *ptr, PropertyRNA *prop); -int RNA_property_multidimensional_array_length(PointerRNA *ptr, PropertyRNA *prop, int dimension); -int RNA_property_dynamic_array_set_length(PointerRNA *ptr, PropertyRNA *prop, int length); +int RNA_property_multi_array_length(PointerRNA *ptr, PropertyRNA *prop, int dimension); +int RNA_property_array_dimension(PointerRNA *ptr, PropertyRNA *prop, int length[]); char RNA_property_array_item_char(PropertyRNA *prop, int index); -unsigned short RNA_property_array_dimension(PropertyRNA *prop, unsigned short dim_size[]); int RNA_property_string_maxlength(PropertyRNA *prop); Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_define.h === --- branches/blender2.5/blender/source/blender/makesrna/RNA_define.h 2009-09-09 19:31:43 UTC (rev 23087) +++ branches/blender2.5/blender/source/blender/makesrna/RNA_define.h 2009-09-09 19:40:46 UTC (rev 23088) @@ -90,7 +90,7 @@ PropertyRNA *RNA_def_float(StructOrFunctionRNA *cont, const char *identifier, float default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax); PropertyRNA *RNA_def_float_vector(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax); PropertyRNA *RNA_def_float_color(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax); -PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont, const char *identifier, int len, int rowsize, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax); +PropertyRNA *RNA_def_float_matrix(StructOrFunctionRNA *cont, const char *identifier, int rows, int columns, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax); PropertyRNA *RNA_def_float_rotation(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value, float hardmin, float hardmax, const char *ui_name, const char *ui_description, float softmin, float softmax); PropertyRNA *RNA_def_float_array(StructOrFunctionRNA *cont, const char *identifier, int len, const float *default_value, @@ -128,8 +128,8 @@ void RNA_def_property_flag(PropertyRNA *prop, int flag); void RNA_def_property_clear_flag(PropertyRNA *prop, int flag); -void RNA_def_property_array(PropertyRNA *prop, int arraylength); -void RNA_def_property_multidimensional_array(PropertyRNA *prop, int arraylength, unsigned short arraydimension, unsigned short dimsize[]); +void RNA_def_property_array(PropertyRN
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23087] branches/blender2.5/blender/source /blender/gpu/SConscript: 2.5:
Revision: 23087
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23087
Author: dingto
Date: 2009-09-09 21:31:43 +0200 (Wed, 09 Sep 2009)
Log Message:
---
2.5:
* Scons compile fix for recent smoke commit.
Modified Paths:
--
branches/blender2.5/blender/source/blender/gpu/SConscript
Modified: branches/blender2.5/blender/source/blender/gpu/SConscript
===
--- branches/blender2.5/blender/source/blender/gpu/SConscript 2009-09-09
18:39:40 UTC (rev 23086)
+++ branches/blender2.5/blender/source/blender/gpu/SConscript 2009-09-09
19:31:43 UTC (rev 23087)
@@ -4,7 +4,7 @@
sources = env.Glob('intern/*.c')
incs = '../blenlib ../blenkernel ../makesdna ../include'
-incs += ' #/extern/glew/include #intern/guardedalloc ../imbuf .'
+incs += ' #/extern/glew/include #intern/guardedalloc #intern/smoke/extern
../imbuf .'
incs += ' ' + env['BF_OPENGL_INC']
___
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 [23086] branches/blender2.5/blender: Smoke :
Revision: 23086
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23086
Author: genscher
Date: 2009-09-09 20:39:40 +0200 (Wed, 09 Sep 2009)
Log Message:
---
Smoke:
* Enable cache for high res + new preview
* Bugfix for smoke banding (in cooperation with N_T)
Hint: Work-in-progress regarding collision objects so can be broken, didn't test
Hint2: jahka enabled a general particle panel but
* bake button doesn't work
* step is not supported for cloth
* several other things there ;)
Modified Paths:
--
branches/blender2.5/blender/intern/smoke/extern/smoke_API.h
branches/blender2.5/blender/intern/smoke/intern/FLUID_3D.cpp
branches/blender2.5/blender/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/blender2.5/blender/intern/smoke/intern/WTURBULENCE.cpp
branches/blender2.5/blender/intern/smoke/intern/WTURBULENCE.h
branches/blender2.5/blender/intern/smoke/intern/smoke_API.cpp
branches/blender2.5/blender/release/ui/buttons_physics_smoke.py
branches/blender2.5/blender/source/blender/blenkernel/BKE_pointcache.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_smoke.h
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
branches/blender2.5/blender/source/blender/blenkernel/intern/smoke.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawvolume.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/gpu/CMakeLists.txt
branches/blender2.5/blender/source/blender/gpu/GPU_draw.h
branches/blender2.5/blender/source/blender/gpu/intern/gpu_draw.c
branches/blender2.5/blender/source/blender/gpu/intern/gpu_extensions.c
branches/blender2.5/blender/source/blender/makesdna/DNA_smoke_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_smoke.c
Modified: branches/blender2.5/blender/intern/smoke/extern/smoke_API.h
===
--- branches/blender2.5/blender/intern/smoke/extern/smoke_API.h 2009-09-09
18:18:09 UTC (rev 23085)
+++ branches/blender2.5/blender/intern/smoke/extern/smoke_API.h 2009-09-09
18:39:40 UTC (rev 23086)
@@ -63,11 +63,11 @@
void smoke_turbulence_step(struct WTURBULENCE *wt, struct FLUID_3D *fluid);
float *smoke_turbulence_get_density(struct WTURBULENCE *wt);
-void smoke_turbulence_get_res(struct WTURBULENCE *wt, unsigned int *res);
+void smoke_turbulence_get_res(struct WTURBULENCE *wt, int *res);
void smoke_turbulence_set_noise(struct WTURBULENCE *wt, int type);
-void smoke_turbulence_initBlenderRNA(struct WTURBULENCE *wt, float *strength);
+void smoke_initWaveletBlenderRNA(struct WTURBULENCE *wt, float *strength);
-void smoke_turbulence_dissolve(struct WTURBULENCE *wt, int speed, int log);
+void smoke_dissolve_wavelet(struct WTURBULENCE *wt, int speed, int log);
// export
void smoke_turbulence_export(struct WTURBULENCE *wt, float **dens, float
**densold, float **tcu, float **tcv, float **tcw);
Modified: branches/blender2.5/blender/intern/smoke/intern/FLUID_3D.cpp
===
--- branches/blender2.5/blender/intern/smoke/intern/FLUID_3D.cpp
2009-09-09 18:18:09 UTC (rev 23085)
+++ branches/blender2.5/blender/intern/smoke/intern/FLUID_3D.cpp
2009-09-09 18:39:40 UTC (rev 23086)
@@ -27,9 +27,9 @@
#include
// boundary conditions of the fluid domain
-#define DOMAIN_BC_FRONT 1
-#define DOMAIN_BC_TOP0
-#define DOMAIN_BC_LEFT 1
+#define DOMAIN_BC_FRONT 0 // z
+#define DOMAIN_BC_TOP1 // y
+#define DOMAIN_BC_LEFT 1 // x
#define DOMAIN_BC_BACK DOMAIN_BC_FRONT
#define DOMAIN_BC_BOTTOM DOMAIN_BC_TOP
#define DOMAIN_BC_RIGHT DOMAIN_BC_LEFT
@@ -111,47 +111,42 @@
}
// set side obstacles
- size_t index;
- for (int y = 0; y < _yRes; y++) // z
-for (int x = 0; x < _xRes; x++)
-{
- // front slab
- index = x + y * _xRes;
- if(DOMAIN_BC_BOTTOM==1) _obstacles[index] = 1;
+ int index;
+ for (int y = 0; y < _yRes; y++)
+ for (int x = 0; x < _xRes; x++)
+ {
+ // front slab
+ index = x + y * _xRes;
+ if(DOMAIN_BC_FRONT==1) _obstacles[index] = 1;
- // back slab
- index += _totalCells - _slabSize;
- if(DOMAIN_BC_TOP==1) _obstacles[index] = 1;
-}
- for (int z = 0; z < _zRes; z++) // y
-for (int x = 0; x < _xRes; x++)
-{
- // bottom slab
- index = x + z * _slabSize;
- if(DOMAIN_BC_FRONT==1) _obstacles[index] = 1;
+ // back slab
+ index += _totalCells - _slabSize;
+ if(DOMAIN_BC_BACK==1) _obstacles[index] = 1;
+ }
- // top slab
- index +
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23085] branches/blender2.5/blender/ projectfiles_vc9/blender/editors/ED_editors.vcproj: 2.5 MSVC projectfiles
Revision: 23085 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23085 Author: elubie Date: 2009-09-09 20:18:09 +0200 (Wed, 09 Sep 2009) Log Message: --- 2.5 MSVC projectfiles * small maintenance for split files in editors/object Modified Paths: -- branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj Modified: branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj === --- branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-09-09 18:09:03 UTC (rev 23084) +++ branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-09-09 18:18:09 UTC (rev 23085) @@ -1075,23 +1075,23 @@ Name="object" > + + @@ -1107,13 +,25 @@ > + + + + + + http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23084] trunk/blender/source/blender: Small code cleanup related to curves, to avoid cryptic names:
Revision: 23084
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23084
Author: blendix
Date: 2009-09-09 20:09:03 +0200 (Wed, 09 Sep 2009)
Log Message:
---
Small code cleanup related to curves, to avoid cryptic names:
renamed set_four_ipo -> key_curve_position_weights
renamed set_afgeleide_four_ipo -> key_curve_tangent_weights
added key_curve_normal_weights
Modified Paths:
--
trunk/blender/source/blender/blenkernel/BKE_key.h
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/texture.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/render/intern/source/strand.c
Modified: trunk/blender/source/blender/blenkernel/BKE_key.h
===
--- trunk/blender/source/blender/blenkernel/BKE_key.h 2009-09-09 17:39:19 UTC
(rev 23083)
+++ trunk/blender/source/blender/blenkernel/BKE_key.h 2009-09-09 18:09:03 UTC
(rev 23084)
@@ -51,8 +51,9 @@
void make_local_key(struct Key *key);
void sort_keys(struct Key *key);
-void set_four_ipo(float d, float *data, int type);
-void set_afgeleide_four_ipo(float d, float *data, int type);
+void key_curve_position_weights(float t, float *data, int type);
+void key_curve_tangent_weights(float t, float *data, int type);
+void key_curve_normal_weights(float t, float *data, int type);
/* only exported to curve.c! */
void cp_cu_key(struct Curve *cu, struct KeyBlock *kb, int start, int end);
Modified: trunk/blender/source/blender/blenkernel/intern/anim.c
===
--- trunk/blender/source/blender/blenkernel/intern/anim.c 2009-09-09
17:39:19 UTC (rev 23083)
+++ trunk/blender/source/blender/blenkernel/intern/anim.c 2009-09-09
18:09:03 UTC (rev 23084)
@@ -253,7 +253,7 @@
/* note, commented out for follow constraint */
//if(cu->flag & CU_FOLLOW) {
- set_afgeleide_four_ipo(1.0f-fac, data, KEY_BSPLINE);
+ key_curve_tangent_weights(1.0f-fac, data, KEY_BSPLINE);
dir[0]= data[0]*p0[0] + data[1]*p1[0] + data[2]*p2[0] +
data[3]*p3[0] ;
dir[1]= data[0]*p0[1] + data[1]*p1[1] + data[2]*p2[1] +
data[3]*p3[1] ;
@@ -268,10 +268,10 @@
nu= cu->nurb.first;
/* make sure that first and last frame are included in the vectors here
*/
- if((nu->type & 7)==CU_POLY) set_four_ipo(1.0f-fac, data, KEY_LINEAR);
- else if((nu->type & 7)==CU_BEZIER) set_four_ipo(1.0f-fac, data,
KEY_LINEAR);
- else if(s0==s1 || p2==p3) set_four_ipo(1.0f-fac, data, KEY_CARDINAL);
- else set_four_ipo(1.0f-fac, data, KEY_BSPLINE);
+ if((nu->type & 7)==CU_POLY) key_curve_position_weights(1.0f-fac, data,
KEY_LINEAR);
+ else if((nu->type & 7)==CU_BEZIER) key_curve_position_weights(1.0f-fac,
data, KEY_LINEAR);
+ else if(s0==s1 || p2==p3) key_curve_position_weights(1.0f-fac, data,
KEY_CARDINAL);
+ else key_curve_position_weights(1.0f-fac, data, KEY_BSPLINE);
vec[0]= data[0]*p0[0] + data[1]*p1[0] + data[2]*p2[0] + data[3]*p3[0] ;
vec[1]= data[0]*p0[1] + data[1]*p1[1] + data[2]*p2[1] + data[3]*p3[1] ;
Modified: trunk/blender/source/blender/blenkernel/intern/curve.c
===
--- trunk/blender/source/blender/blenkernel/intern/curve.c 2009-09-09
17:39:19 UTC (rev 23083)
+++ trunk/blender/source/blender/blenkernel/intern/curve.c 2009-09-09
18:09:03 UTC (rev 23084)
@@ -1476,7 +1476,7 @@
if (nu->tilt_interp==3) { /* May as well support for
tilt also 2.47 ease interp */
tilt_array[a] = prevbezt->alfa + (bezt->alfa -
prevbezt->alfa)*(3.0f*fac*fac - 2.0f*fac*fac*fac);
} else {
- set_four_ipo(fac, t, nu->tilt_interp);
+ key_curve_position_weights(fac, t,
nu->tilt_interp);
tilt_array[a]= t[0]*pprev->alfa +
t[1]*prevbezt->alfa + t[2]*bezt->alfa + t[3]*next->alfa;
}
}
@@ -1491,7 +1491,7 @@
/* reuse interpolation from tilt if we can */
if (tilt_array==NULL || nu->tilt_interp !=
nu->radius_interp) {
- set_four_ipo(fac, t, nu->radius_interp);
+ key_curve_position_weights(fac, t,
nu->radius_interp);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23082] branches/blender2.5/blender/source /blender/windowmanager/intern/wm_operators.c: 2.5: fix for recent file operator opening wrong item.
Revision: 23082
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23082
Author: blendix
Date: 2009-09-09 19:34:14 +0200 (Wed, 09 Sep 2009)
Log Message:
---
2.5: fix for recent file operator opening wrong item.
Modified Paths:
--
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
===
---
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
2009-09-09 15:45:12 UTC (rev 23081)
+++
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
2009-09-09 17:34:14 UTC (rev 23082)
@@ -803,7 +803,7 @@
WM_read_file(C, G.sce, op->reports);
}
else {
- struct RecentFile *recent =
BLI_findlink(&(G.recent_files), event-2);
+ struct RecentFile *recent =
BLI_findlink(&(G.recent_files), event-1);
if(recent) {
WM_event_add_notifier(C, NC_WINDOW, NULL);
WM_read_file(C, recent->filename, op->reports);
@@ -831,11 +831,11 @@
EnumPropertyItem tmp = {0, "", 0, "", ""};
EnumPropertyItem *item= NULL;
struct RecentFile *recent;
- int totitem= 0, i, ofs= 0;
+ int totitem= 0, i;
/* dynamically construct enum */
for(recent = G.recent_files.first, i=0; (inext, i++) {
- tmp.value= i+ofs+1;
+ tmp.value= i+1;
tmp.identifier= recent->filename;
tmp.name= recent->filename;
RNA_enum_item_add(&item, &totitem, &tmp);
___
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 [23081] branches/blender2.5/blender/source /blender: Keyboard shortcuts
Revision: 23081 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23081 Author: billrey Date: 2009-09-09 17:45:12 +0200 (Wed, 09 Sep 2009) Log Message: --- Keyboard shortcuts Moved to modern OS standards for opening, saving, copying, pasting, cutting (text), new document, undo and redo. For Mac users, Cmd is used in addition to the Ctrl-based shortcuts. These changes are made according to an agreement among developers on IRC. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_buttons.c branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c branches/blender2.5/blender/source/blender/editors/space_text/space_text.c branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c Modified: branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_buttons.c === --- branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_buttons.c 2009-09-09 11:52:56 UTC (rev 23080) +++ branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_buttons.c 2009-09-09 15:45:12 UTC (rev 23081) @@ -215,7 +215,7 @@ /* onion-skinning */ subcol= uiLayoutColumn(col, 1); uiItemR(subcol, "Onion Skinning", 0, &ptr, "use_onion_skinning", 0); - uiItemR(subcol, "GStep", 0, &ptr, "max_ghost_range", 0); // XXX shorter name here? (i.e. GStep) + uiItemR(subcol, "Frames", 0, &ptr, "max_ghost_range", 0); // XXX shorter name here? (i.e. GStep) /* additional options... */ subcol= uiLayoutColumn(col, 1); Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c === --- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c 2009-09-09 11:52:56 UTC (rev 23080) +++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c 2009-09-09 15:45:12 UTC (rev 23081) @@ -3328,7 +3328,7 @@ WM_keymap_verify_item(keymap, "SCREEN_OT_repeat_history", F3KEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_OSKEY, 0); + WM_keymap_add_item(keymap, "SCREEN_OT_repeat_last", RKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception WM_keymap_add_item(keymap, "SCREEN_OT_region_flip", F5KEY, KM_PRESS, 0, 0); WM_keymap_verify_item(keymap, "SCREEN_OT_redo_last", F6KEY, KM_PRESS, 0, 0); @@ -3347,11 +3347,7 @@ /* render */ WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, 0, 0); -// WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_CTRL, 0); -// WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_OSKEY, 0); RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", F12KEY, KM_PRESS, KM_CTRL, 0)->ptr, "animation", 1); -// RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_CTRL|KM_SHIFT, 0)->ptr, "animation", 1); -// RNA_boolean_set(WM_keymap_add_item(keymap, "SCREEN_OT_render", RETKEY, KM_PRESS, KM_OSKEY|KM_SHIFT, 0)->ptr, "animation", 1); WM_keymap_add_item(keymap, "SCREEN_OT_render_view_cancel", ESCKEY, KM_PRESS, 0, 0); WM_keymap_add_item(keymap, "SCREEN_OT_render_view_show", F11KEY, KM_PRESS, 0, 0); Modified: branches/blender2.5/blender/source/blender/editors/space_text/space_text.c === --- branches/blender2.5/blender/source/blender/editors/space_text/space_text.c 2009-09-09 11:52:56 UTC (rev 23080) +++ branches/blender2.5/blender/source/blender/editors/space_text/space_text.c 2009-09-09 15:45:12 UTC (rev 23081) @@ -220,40 +220,44 @@ WM_keymap_add_item(keymap, "TEXT_OT_run_script", PKEY, KM_PRESS, KM_ALT, 0); + + WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item(keymap, "TEXT_OT_cut", XKEY, KM_PRESS, KM_OSKEY, 0); + WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0); + WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_OSKEY, 0);//Mac Exception WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_ALT, 0); - WM_keymap_add_item(keymap, "TEXT_OT_copy", CKEY, KM_PRESS, KM_CTRL, 0); - WM_keymap_add_item
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23080] branches/blender2.5/blender: 2.5: Object module
Revision: 23080 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23080 Author: blendix Date: 2009-09-09 13:52:56 +0200 (Wed, 09 Sep 2009) Log Message: --- 2.5: Object module * Split object_edit.c into multiple files: object_add.c, object_edit.c, object_hook.c, object_relations.c, object_select.c, object_transform.c. * Rename files to have consistent object_ and mball_ prefix: object_shapekey.c, object_lattice.c, object_vgroup.c, mball_edit.c. * Added operators: * vertex group menu and set active * apply location, rotation, scale, visual transform (location is new) * make local * make vertex parent * move to layer * convert to curve/mesh (not finished yet) * Many small fixes for marked issues, but still much code to be cleaned up here... Modified Paths: -- branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj branches/blender2.5/blender/release/ui/space_info.py 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/blenkernel/intern/library.c branches/blender2.5/blender/source/blender/blenlib/intern/util.c branches/blender2.5/blender/source/blender/editors/armature/editarmature.c branches/blender2.5/blender/source/blender/editors/armature/editarmature_retarget.c branches/blender2.5/blender/source/blender/editors/armature/meshlaplacian.c branches/blender2.5/blender/source/blender/editors/armature/poseobject.c branches/blender2.5/blender/source/blender/editors/include/ED_armature.h branches/blender2.5/blender/source/blender/editors/include/ED_mball.h branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h branches/blender2.5/blender/source/blender/editors/include/ED_object.h branches/blender2.5/blender/source/blender/editors/object/object_edit.c branches/blender2.5/blender/source/blender/editors/object/object_intern.h branches/blender2.5/blender/source/blender/editors/object/object_modifier.c branches/blender2.5/blender/source/blender/editors/object/object_ops.c branches/blender2.5/blender/source/blender/editors/object/object_vgroup.c branches/blender2.5/blender/source/blender/editors/screen/screen_context.c branches/blender2.5/blender/source/blender/editors/sculpt_paint/paint_vertex.c branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_ops.c branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_buttons.c branches/blender2.5/blender/source/blender/editors/util/undo.c branches/blender2.5/blender/source/blender/makesrna/RNA_enum_types.h branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c branches/blender2.5/blender/source/blender/windowmanager/intern/wm_event_system.c Added Paths: --- branches/blender2.5/blender/source/blender/editors/metaball/mball_edit.c branches/blender2.5/blender/source/blender/editors/object/object_add.c branches/blender2.5/blender/source/blender/editors/object/object_constraint.c branches/blender2.5/blender/source/blender/editors/object/object_group.c branches/blender2.5/blender/source/blender/editors/object/object_hook.c branches/blender2.5/blender/source/blender/editors/object/object_lattice.c branches/blender2.5/blender/source/blender/editors/object/object_relations.c branches/blender2.5/blender/source/blender/editors/object/object_select.c branches/blender2.5/blender/source/blender/editors/object/object_shapekey.c branches/blender2.5/blender/source/blender/editors/object/object_transform.c Removed Paths: - branches/blender2.5/blender/source/blender/editors/metaball/editmball.c branches/blender2.5/blender/source/blender/editors/object/editconstraint.c branches/blender2.5/blender/source/blender/editors/object/editgroup.c branches/blender2.5/blender/source/blender/editors/object/editkey.c branches/blender2.5/blender/source/blender/editors/object/editlattice.c Modified: branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj === --- branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-09-09 11:10:28 UTC (rev 23079) +++ branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-09-09 11:52:56 UTC (rev 23080) @@ -1075,19 +1075,19 @@ Name="object" > +
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23079] branches/blender2.5/blender/source /blender/windowmanager/intern/wm_operators.c: 2.5: WM_menu_invoke now uses the first enum property it can f
Revision: 23079
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23079
Author: blendix
Date: 2009-09-09 13:10:28 +0200 (Wed, 09 Sep 2009)
Log Message:
---
2.5: WM_menu_invoke now uses the first enum property it can find,
if no enum property named "type" is available.
Modified Paths:
--
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
Modified:
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
===
---
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
2009-09-09 11:05:10 UTC (rev 23078)
+++
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
2009-09-09 11:10:28 UTC (rev 23079)
@@ -448,13 +448,24 @@
/* default op callbacks, exported *** */
/* invoke callback, uses enum property named "type" */
-/* only weak thing is the fixed property name... */
int WM_menu_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
- PropertyRNA *prop= RNA_struct_find_property(op->ptr, "type");
+ PropertyRNA *prop;
uiPopupMenu *pup;
uiLayout *layout;
+ prop= RNA_struct_find_property(op->ptr, "type");
+
+ if(!prop) {
+ RNA_STRUCT_BEGIN(op->ptr, findprop) {
+ if(RNA_property_type(findprop) == PROP_ENUM) {
+ prop= findprop;
+ break;
+ }
+ }
+ RNA_STRUCT_END;
+ }
+
if(prop==NULL) {
printf("WM_menu_invoke: %s has no \"type\" enum property\n",
op->type->idname);
}
@@ -464,7 +475,7 @@
else {
pup= uiPupMenuBegin(C, op->type->name, 0);
layout= uiPupMenuLayout(pup);
- uiItemsEnumO(layout, op->type->idname, "type");
+ uiItemsEnumO(layout, op->type->idname,
(char*)RNA_property_identifier(prop));
uiPupMenuEnd(C, pup);
}
___
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 [23078] branches/blender2.5/blender/source /blender/makesrna/intern/rna_pose.c: 2.5: use bone groups icon in UI.
Revision: 23078 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23078 Author: blendix Date: 2009-09-09 13:05:10 +0200 (Wed, 09 Sep 2009) Log Message: --- 2.5: use bone groups icon in UI. Modified Paths: -- branches/blender2.5/blender/source/blender/makesrna/intern/rna_pose.c Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_pose.c === --- branches/blender2.5/blender/source/blender/makesrna/intern/rna_pose.c 2009-09-09 08:29:38 UTC (rev 23077) +++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_pose.c 2009-09-09 11:05:10 UTC (rev 23078) @@ -386,6 +386,7 @@ srna= RNA_def_struct(brna, "BoneGroup", NULL); RNA_def_struct_sdna(srna, "bActionGroup"); RNA_def_struct_ui_text(srna, "Bone Group", "Groups of Pose Channels (Bones)."); + RNA_def_struct_ui_icon(srna, ICON_GROUP_BONE); /* name */ prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); ___ 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 [23077] branches/bmesh/blender/source/ blender/blenkernel/BKE_utildefines.h: gcc compile tweak
Revision: 23077
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23077
Author: joeedh
Date: 2009-09-09 10:29:38 +0200 (Wed, 09 Sep 2009)
Log Message:
---
gcc compile tweak
Modified Paths:
--
branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
===
--- branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
2009-09-09 08:25:39 UTC (rev 23076)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
2009-09-09 08:29:38 UTC (rev 23077)
@@ -243,7 +243,7 @@
#if defined(_MSC_VER)
#define BM_INLINE static __forceinline
#else
-#define BM_INLINE static forceinline
+#define BM_INLINE static inline __attribute((always_inline))
#endif
#define BMEMSET(mem, val, size) {int _i; char *_c = mem; for (_i=0; _ihttp://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23076] branches/bmesh/blender/source/ blender/blenkernel: gcc compile tweak
Revision: 23076
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23076
Author: joeedh
Date: 2009-09-09 10:25:39 +0200 (Wed, 09 Sep 2009)
Log Message:
---
gcc compile tweak
Modified Paths:
--
branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
===
--- branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
2009-09-09 07:52:44 UTC (rev 23075)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
2009-09-09 08:25:39 UTC (rev 23076)
@@ -243,7 +243,7 @@
#if defined(_MSC_VER)
#define BM_INLINE static __forceinline
#else
-#define BM_INLINE static inline
+#define BM_INLINE static forceinline
#endif
#define BMEMSET(mem, val, size) {int _i; char *_c = mem; for (_i=0; _ibm, &weldop);
- //BMO_CallOpf(em->bm, "removedoubles verts=%av dist=%f",
amd->merge_dist);
-
BMEdit_RecalcTesselation(em);
cddm = CDDM_from_BMEditMesh(em, NULL);
___
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 [23075] branches/blender2.5/blender/source /blender/editors/physics/ed_fluidsim.c: * Temporary fix to get fluid sim ( and fluid control) working prope
Revision: 23075
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23075
Author: broken
Date: 2009-09-09 09:52:44 +0200 (Wed, 09 Sep 2009)
Log Message:
---
* Temporary fix to get fluid sim (and fluid control) working properly (without
animated parameters). This just fills the fluid sim animation channels with
default values for now, but will need to be updated to new animation system.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
Modified:
branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
===
--- branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
2009-09-09 07:05:04 UTC (rev 23074)
+++ branches/blender2.5/blender/source/blender/editors/physics/ed_fluidsim.c
2009-09-09 07:52:44 UTC (rev 23075)
@@ -200,6 +200,28 @@
static void fluidsimInitChannel(Scene *scene, float **setchannel, int size,
float *time,
int *icuIds, float *defaults, Ipo* ipo, int entries)
{
+
+ int i, j;
+ char *cstr = NULL;
+ float *channel = NULL;
+
+ cstr = "fluidsiminit_channelfloat";
+ if(entries>1) cstr = "fluidsiminit_channelvec";
+ channel = MEM_callocN( size* (entries+1)* sizeof(float), cstr );
+
+ /* defaults for now */
+ for(j=0; jhttp://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23074] branches/bmesh/blender/source/ blender/blenkernel: gcc compile fix
Revision: 23074
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23074
Author: joeedh
Date: 2009-09-09 09:05:04 +0200 (Wed, 09 Sep 2009)
Log Message:
---
gcc compile fix
Modified Paths:
--
branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
branches/bmesh/blender/source/blender/blenkernel/intern/modifiers_bmesh.c
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
===
--- branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
2009-09-09 06:28:58 UTC (rev 23073)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_utildefines.h
2009-09-09 07:05:04 UTC (rev 23074)
@@ -241,9 +241,9 @@
/*little macro so inline keyword works*/
#if defined(_MSC_VER)
-#define BM_INLINE __forceinline
+#define BM_INLINE static __forceinline
#else
-#define BM_INLINE inline
+#define BM_INLINE static inline
#endif
#define BMEMSET(mem, val, size) {int _i; char *_c = mem; for (_i=0; _idata.buf)[i]
+#if 0
/*calculate merge mapping*/
if (j == 0) {
BMOperator findop;
@@ -438,30 +439,25 @@
BMO_ITER(v, &oiter, em->bm, &findop, "targetmapout", 0)
{
v2 = BMO_IterMapValp(&oiter);
- /*make sure merge pairs are
duplicate-to-duplicate*/
- /*if (BMINDEX_GET(v) >= s1->len &&
BMINDEX_GET(v2) >= s1->len)
- continue;
- else if (BMINDEX_GET(v) < s1->len &&
BMINDEX_GET(v2) < s1->len)
- continue;*/
-
indexMap[BMINDEX_GET(v)] = BMINDEX_GET(v2)+1;
}
BMO_Finish_Op(em->bm, &findop);
}
+#endif
/*generate merge mappping using index map. we do this by using
the
operator slots as lookup arrays.*/
#define E(i) (i) < s1->len ? _E(s1, i) : _E(s2, (i)-s1->len)
- for (i=0; ibm, &weldop, "targetmap", v,
v2);
- }
+ }*/
#undef E
#undef _E
@@ -483,7 +479,7 @@
cddm = CDDM_from_BMEditMesh(em, NULL);
BMEdit_Free(em);
- MEM_freeN(indexMap);
+ //MEM_freeN(indexMap);
return cddm;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
