Revision: 14839
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14839
Author: genscher
Date: 2008-05-14 18:14:40 +0200 (Wed, 14 May 2008)
Log Message:
-----------
svn merge -r 14810:14838
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/cloth/blender/source/blender/blenkernel/BKE_mball.h
branches/cloth/blender/source/blender/blenkernel/intern/image.c
branches/cloth/blender/source/blender/blenkernel/intern/mball.c
branches/cloth/blender/source/blender/blenkernel/intern/object.c
branches/cloth/blender/source/blender/blenkernel/intern/particle_system.c
branches/cloth/blender/source/blender/blenlib/intern/boxpack2d.c
branches/cloth/blender/source/blender/include/BSE_drawview.h
branches/cloth/blender/source/blender/makesdna/DNA_space_types.h
branches/cloth/blender/source/blender/python/api2_2x/doc/Image.py
branches/cloth/blender/source/blender/python/api2_2x/doc/Texture.py
branches/cloth/blender/source/blender/render/intern/source/rayshade.c
branches/cloth/blender/source/blender/src/buttons_editing.c
branches/cloth/blender/source/blender/src/buttons_object.c
branches/cloth/blender/source/blender/src/buttons_scene.c
branches/cloth/blender/source/blender/src/buttons_shading.c
branches/cloth/blender/source/blender/src/drawaction.c
branches/cloth/blender/source/blender/src/drawarmature.c
branches/cloth/blender/source/blender/src/drawimage.c
branches/cloth/blender/source/blender/src/drawview.c
branches/cloth/blender/source/blender/src/editaction.c
branches/cloth/blender/source/blender/src/editipo.c
branches/cloth/blender/source/blender/src/editmesh_mods.c
branches/cloth/blender/source/blender/src/editmesh_tools.c
branches/cloth/blender/source/blender/src/editview.c
branches/cloth/blender/source/blender/src/header_image.c
branches/cloth/blender/source/blender/src/header_ipo.c
branches/cloth/blender/source/blender/src/header_nla.c
branches/cloth/blender/source/blender/src/header_view3d.c
branches/cloth/blender/source/blender/src/interface_icons.c
branches/cloth/blender/source/blender/src/renderwin.c
branches/cloth/blender/source/blender/src/transform.c
branches/cloth/blender/source/blender/src/transform_constraints.c
branches/cloth/blender/source/blender/src/transform_conversions.c
branches/cloth/blender/source/blender/src/usiblender.c
branches/cloth/blender/source/blender/src/view.c
branches/cloth/blender/source/gameengine/Ketsji/KX_Light.cpp
Modified: branches/cloth/blender/source/blender/blenkernel/BKE_mball.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_mball.h
2008-05-14 16:09:56 UTC (rev 14838)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_mball.h
2008-05-14 16:14:40 UTC (rev 14839)
@@ -91,7 +91,6 @@
float (*function)(float, float, float);
float size, delta; /* cube size, normal delta */
int bounds; /* cube range within
lattice */
- MB_POINT start; /* start point on surface */
CUBES *cubes; /* active cubes */
VERTICES vertices; /* surface vertices */
CENTERLIST **centers; /* cube center hash table */
Modified: branches/cloth/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/image.c
2008-05-14 16:09:56 UTC (rev 14838)
+++ branches/cloth/blender/source/blender/blenkernel/intern/image.c
2008-05-14 16:14:40 UTC (rev 14839)
@@ -1728,31 +1728,38 @@
{
RenderResult *rr= RE_GetResult(RE_GetRender(G.scene->id.name));
- if(rr && iuser) {
+ if(rr) {
RenderResult rres;
float *rectf;
unsigned int *rect;
- int channels= 4, layer= iuser->layer;
+ float dither;
+ int channels, layer, pass;
+
+ channels= 4;
+ layer= (iuser)? iuser->layer: 0;
+ pass= (iuser)? iuser->pass: 0;
/* this gives active layer, composite or seqence result */
RE_GetResultImage(RE_GetRender(G.scene->id.name), &rres);
rect= (unsigned int *)rres.rect32;
rectf= rres.rectf;
-
+ dither= G.scene->r.dither_intensity;
+
/* get compo/seq result by default */
if(rr->rectf && layer==0);
else if(rr->layers.first) {
- RenderLayer *rl= BLI_findlink(&rr->layers,
iuser->layer-(rr->rectf?1:0));
+ RenderLayer *rl= BLI_findlink(&rr->layers,
layer-(rr->rectf?1:0));
if(rl) {
/* there's no combined pass, is in renderlayer
itself */
- if(iuser->pass==0) {
+ if(pass==0) {
rectf= rl->rectf;
}
else {
- RenderPass *rpass=
BLI_findlink(&rl->passes, iuser->pass-1);
+ RenderPass *rpass=
BLI_findlink(&rl->passes, pass-1);
if(rpass) {
channels= rpass->channels;
rectf= rpass->rect;
+ dither= 0.0f; /* don't dither
passes */
}
}
}
@@ -1779,6 +1786,7 @@
ibuf->channels= channels;
ibuf->zbuf_float= rres.rectz;
ibuf->flags |= IB_zbuffloat;
+ ibuf->dither= dither;
ima->ok= IMA_OK_LOADED;
return ibuf;
Modified: branches/cloth/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/mball.c
2008-05-14 16:09:56 UTC (rev 14838)
+++ branches/cloth/blender/source/blender/blenkernel/intern/mball.c
2008-05-14 16:14:40 UTC (rev 14839)
@@ -375,7 +375,7 @@
#define RTF 7 /* right top far corner */
/* the LBN corner of cube (i, j, k), corresponds with location
- * (start.x+(i-0.5)*size, start.y+(j-0.5)*size, start.z+(k-0.5)*size) */
+ * (i-0.5)*size, (j-0.5)*size, (k-0.5)*size) */
#define HASHBIT (5)
#define HASHSIZE (size_t)(1<<(3*HASHBIT)) /*! < hash table size (32768) */
@@ -836,11 +836,11 @@
c = (CORNER *) new_pgn_element(sizeof(CORNER));
c->i = i;
- c->x = p->start.x+((float)i-0.5f)*p->size;
+ c->x = ((float)i-0.5f)*p->size;
c->j = j;
- c->y = p->start.y+((float)j-0.5f)*p->size;
+ c->y = ((float)j-0.5f)*p->size;
c->k = k;
- c->z = p->start.z+((float)k-0.5f)*p->size;
+ c->z = ((float)k-0.5f)*p->size;
c->value = p->function(c->x, c->y, c->z);
c->next = p->corners[index];
@@ -1393,7 +1393,7 @@
c_i=
(int)floor(workp.x/mbproc->size);
c_j=
(int)floor(workp.y/mbproc->size);
c_k=
(int)floor(workp.z/mbproc->size);
-
+
/* add CUBE (with
indexes c_i, c_j, c_k) to the stack,
* this cube includes
found point of Implicit Surface */
if (ml->flag &
MB_NEGATIVE)
@@ -1403,10 +1403,8 @@
}
len =
sqrt((workp.x-in.x)*(workp.x-in.x) + (workp.y-in.y)*(workp.y-in.y) +
(workp.z-in.z)*(workp.z-in.z));
workp_v = tmp_v;
+
}
-
- mbproc->start.x= mbproc->start.y=
mbproc->start.z= 0.0;
-
}
}
}
Modified: branches/cloth/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/object.c
2008-05-14 16:09:56 UTC (rev 14838)
+++ branches/cloth/blender/source/blender/blenkernel/intern/object.c
2008-05-14 16:14:40 UTC (rev 14839)
@@ -1056,6 +1056,7 @@
psysn->effectors.first= psysn->effectors.last= 0;
psysn->pathcachebufs.first = psysn->pathcachebufs.last = NULL;
+ psysn->childcachebufs.first = psysn->childcachebufs.last = NULL;
psysn->reactevents.first = psysn->reactevents.last = NULL;
psysn->renderdata = NULL;
Modified:
branches/cloth/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/particle_system.c
2008-05-14 16:09:56 UTC (rev 14838)
+++ branches/cloth/blender/source/blender/blenkernel/intern/particle_system.c
2008-05-14 16:14:40 UTC (rev 14839)
@@ -3772,10 +3772,12 @@
near=0;
for(n=1; n<neighbours; n++){
if(ptn[n].dist<2.0f*pa->size){
-
bvf->Subf(dvec,pa->state.co,pars[ptn[n].index].state.co);
-
bvf->Mulf(dvec,(2.0f*pa->size-ptn[n].dist)/ptn[n].dist);
- bvf->Addf(avoid,avoid,dvec);
- near++;
+ if(ptn[n].dist!=0.0f) {
+
bvf->Subf(dvec,pa->state.co,pars[ptn[n].index].state.co);
+
bvf->Mulf(dvec,(2.0f*pa->size-ptn[n].dist)/ptn[n].dist);
+
bvf->Addf(avoid,avoid,dvec);
+ near++;
+ }
}
/* ptn[] is distance ordered so no need
to check others */
else break;
Modified: branches/cloth/blender/source/blender/blenlib/intern/boxpack2d.c
===================================================================
--- branches/cloth/blender/source/blender/blenlib/intern/boxpack2d.c
2008-05-14 16:09:56 UTC (rev 14838)
+++ branches/cloth/blender/source/blender/blenlib/intern/boxpack2d.c
2008-05-14 16:14:40 UTC (rev 14839)
@@ -130,7 +130,7 @@
* 'box->index' is not used at all, the only reason its there
* is that the box array is sorted by area and programs
need to be able
* to have some way of writing the boxes back to the
original data.
- * len - the number of boxes in teh array.
+ * len - the number of boxes in the array.
* tot_width and tot_height are set so you can normalize the data.
* */
void boxPack2D(boxPack *boxarray, int len, float *tot_width, float *tot_height)
Modified: branches/cloth/blender/source/blender/include/BSE_drawview.h
===================================================================
--- branches/cloth/blender/source/blender/include/BSE_drawview.h
2008-05-14 16:09:56 UTC (rev 14838)
+++ branches/cloth/blender/source/blender/include/BSE_drawview.h
2008-05-14 16:14:40 UTC (rev 14839)
@@ -59,7 +59,7 @@
void draw_depth(struct ScrArea *sa, void *spacedata);
void view3d_update_depths(struct View3D *v3d);
-int update_time(void);
+int update_time(int cfra);
void calc_viewborder(struct View3D *v3d, struct rctf *viewborder_r);
void view3d_set_1_to_1_viewborder(struct View3D *v3d);
Modified: branches/cloth/blender/source/blender/makesdna/DNA_space_types.h
===================================================================
--- branches/cloth/blender/source/blender/makesdna/DNA_space_types.h
2008-05-14 16:09:56 UTC (rev 14838)
+++ branches/cloth/blender/source/blender/makesdna/DNA_space_types.h
2008-05-14 16:14:40 UTC (rev 14839)
@@ -524,7 +524,8 @@
#define SI_DRAW_STRETCH 1<<21
/* SpaceIpo->flag */
-#define SIPO_LOCK_VIEW 1<<0
+#define SIPO_LOCK_VIEW 1<<0
+#define SIPO_NOTRANSKEYCULL 1<<1
/* SpaceText flags (moved from DNA_text_types.h) */
@@ -616,6 +617,7 @@
#define SNLA_ALLKEYED 1
#define SNLA_ACTIVELAYERS 2
#define SNLA_DRAWTIME 4
+#define SNLA_NOTRANSKEYCULL 8
/* time->flag */
/* show timing in frames instead of in seconds */
Modified: branches/cloth/blender/source/blender/python/api2_2x/doc/Image.py
===================================================================
--- branches/cloth/blender/source/blender/python/api2_2x/doc/Image.py
2008-05-14 16:09:56 UTC (rev 14838)
+++ branches/cloth/blender/source/blender/python/api2_2x/doc/Image.py
2008-05-14 16:14:40 UTC (rev 14839)
@@ -48,7 +48,7 @@
@type height: int
@param height: The height of the new Image object, between 1 and 5000.
@type depth: int
- @param depth: The colour depth of the new Image object. (32:RGBA 8bit
channels, 128:RGBA 32bit high dynamic range float channels).
+ @param depth: The color depth of the new Image object. (32:RGBA 8bit
channels, 128:RGBA 32bit high dynamic range float channels).
@rtype: Blender Image
@return: A new Blender Image object.
"""
Modified: branches/cloth/blender/source/blender/python/api2_2x/doc/Texture.py
===================================================================
--- branches/cloth/blender/source/blender/python/api2_2x/doc/Texture.py
2008-05-14 16:09:56 UTC (rev 14838)
+++ branches/cloth/blender/source/blender/python/api2_2x/doc/Texture.py
2008-05-14 16:14:40 UTC (rev 14839)
@@ -80,7 +80,7 @@
@type ExtendModes: readonly dictionary
@var ExtendModes: Extend, clip, repeat or checker modes for image textures
- - EXTEND - Extends the colour of the edge
+ - EXTEND - Extends the color of the edge
- CLIP - Return alpha 0.0 outside image
- CLIPCUBE - Return alpha 0.0 around cube-shaped area around
image
- REPEAT - Repeat image vertically and horizontally
@@ -209,10 +209,10 @@
@type TexCo: readonly dictionary
@var MapTo: Flags for MTex.mapto.
- - COL - Make the texture affect the basic colour of the material
+ - COL - Make the texture affect the basic color of the material
- NOR - Make the texture affect the rendered normal
- - CSP - Make the texture affect the specularity colour
- - CMIR - Make the texture affect the mirror colour
+ - CSP - Make the texture affect the specularity color
+ - CMIR - Make the texture affect the mirror color
- REF - Make the texture affect the diffuse reflectivity value
- SPEC - Make the texture affect the specularity value
- HARD - Make the texture affect the hardness value
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
