[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30275] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/ blender -r30259:30274
Campbell Barton
ideasman42 at gmail.com
Tue Jul 13 18:11:18 CEST 2010
Revision: 30275
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30275
Author: campbellbarton
Date: 2010-07-13 18:11:16 +0200 (Tue, 13 Jul 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30259:30274
Modified Paths:
--------------
branches/render25/extern/libopenjpeg/dwt.c
branches/render25/source/blender/blenkernel/BKE_scene.h
branches/render25/source/blender/blenkernel/intern/mball.c
branches/render25/source/blender/blenkernel/intern/scene.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenkernel/intern/world.c
branches/render25/source/blender/editors/include/ED_datafiles.h
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/screen/screen_ops.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_sequencer/sequencer_edit.c
branches/render25/source/blender/gpu/gpu_buffers.h
branches/render25/source/blender/gpu/intern/gpu_buffers.c
branches/render25/source/blender/gpu/intern/gpu_draw.c
branches/render25/source/blender/makesdna/DNA_scene_types.h
branches/render25/source/blender/makesrna/intern/rna_controller.c
branches/render25/source/blender/makesrna/intern/rna_modifier.c
branches/render25/source/blender/makesrna/intern/rna_pose.c
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
branches/render25/source/blender/windowmanager/intern/wm_files.c
Added Paths:
-----------
branches/render25/source/blender/editors/datafiles/startup.blend.c
Removed Paths:
-------------
branches/render25/source/blender/editors/datafiles/B.blend.c
Modified: branches/render25/extern/libopenjpeg/dwt.c
===================================================================
--- branches/render25/extern/libopenjpeg/dwt.c 2010-07-13 16:06:51 UTC (rev 30274)
+++ branches/render25/extern/libopenjpeg/dwt.c 2010-07-13 16:11:16 UTC (rev 30275)
@@ -610,7 +610,7 @@
int i;
for(i = 0; i < count; ++i){
__m128 tmp = vw[i*2];
- vw[i*2] = tmp * c;
+ vw[i*2] = _mm_mul_ps(tmp, c);
}
}
@@ -622,18 +622,18 @@
__m128 tmp1 = vl[ 0];
__m128 tmp2 = vw[-1];
__m128 tmp3 = vw[ 0];
- vw[-1] = tmp2 + ((tmp1 + tmp3) * c);
+ vw[-1] = _mm_add_ps(tmp2, _mm_mul_ps(_mm_add_ps(tmp1, tmp3), c));
vl = vw;
vw += 2;
}
if(m >= k){
return;
}
- c += c;
- c *= vl[0];
+ c = _mm_add_ps(c, c);
+ c = _mm_mul_ps(c, vl[0]);
for(; m < k; ++m){
__m128 tmp = vw[-1];
- vw[-1] = tmp + c;
+ vw[-1] = _mm_add_ps(tmp, c);
vw += 2;
}
}
Modified: branches/render25/source/blender/blenkernel/BKE_scene.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_scene.h 2010-07-13 16:06:51 UTC (rev 30274)
+++ branches/render25/source/blender/blenkernel/BKE_scene.h 2010-07-13 16:11:16 UTC (rev 30275)
@@ -63,7 +63,7 @@
struct Scene *copy_scene(struct Main *bmain, struct Scene *sce, int type);
void unlink_scene(struct Main *bmain, struct Scene *sce, struct Scene *newsce);
-int next_object(struct Scene *scene, int val, struct Base **base, struct Object **ob);
+int next_object(struct Scene **scene, int val, struct Base **base, struct Object **ob);
struct Object *scene_find_camera(struct Scene *sc);
struct Object *scene_camera_switch_find(struct Scene *scene); // DURIAN_CAMERA_SWITCH
int scene_camera_switch_update(struct Scene *scene);
Modified: branches/render25/source/blender/blenkernel/intern/mball.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/mball.c 2010-07-13 16:06:51 UTC (rev 30274)
+++ branches/render25/source/blender/blenkernel/intern/mball.c 2010-07-13 16:11:16 UTC (rev 30275)
@@ -296,6 +296,7 @@
* because this metaball influence polygonisation of metaballs. */
void copy_mball_properties(Scene *scene, Object *active_object)
{
+ Scene *sce_iter= scene;
Base *base;
Object *ob;
MetaBall *active_mball = (MetaBall*)active_object->data;
@@ -305,10 +306,10 @@
splitIDname(active_object->id.name+2, basisname, &basisnr);
/* XXX recursion check, see scene.c, just too simple code this next_object() */
- if(F_ERROR==next_object(scene, 0, 0, 0))
+ if(F_ERROR==next_object(&sce_iter, 0, 0, 0))
return;
- while(next_object(scene, 1, &base, &ob)) {
+ while(next_object(&sce_iter, 1, &base, &ob)) {
if (ob->type==OB_MBALL) {
if(ob!=active_object){
splitIDname(ob->id.name+2, obname, &obnr);
@@ -338,6 +339,7 @@
*/
Object *find_basis_mball(Scene *scene, Object *basis)
{
+ Scene *sce_iter= scene;
Base *base;
Object *ob,*bob= basis;
MetaElem *ml=NULL;
@@ -348,10 +350,10 @@
totelem= 0;
/* XXX recursion check, see scene.c, just too simple code this next_object() */
- if(F_ERROR==next_object(scene, 0, 0, 0))
+ if(F_ERROR==next_object(&sce_iter, 0, 0, 0))
return NULL;
- while(next_object(scene, 1, &base, &ob)) {
+ while(next_object(&sce_iter, 1, &base, &ob)) {
if (ob->type==OB_MBALL) {
if(ob==bob){
@@ -1507,6 +1509,7 @@
float init_meta(Scene *scene, Object *ob) /* return totsize */
{
+ Scene *sce_iter= scene;
Base *base;
Object *bob;
MetaBall *mb;
@@ -1523,9 +1526,8 @@
splitIDname(ob->id.name+2, obname, &obnr);
/* make main array */
-
- next_object(scene, 0, 0, 0);
- while(next_object(scene, 1, &base, &bob)) {
+ next_object(&sce_iter, 0, 0, 0);
+ while(next_object(&sce_iter, 1, &base, &bob)) {
if(bob->type==OB_MBALL) {
zero_size= 0;
Modified: branches/render25/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/scene.c 2010-07-13 16:06:51 UTC (rev 30274)
+++ branches/render25/source/blender/blenkernel/intern/scene.c 2010-07-13 16:11:16 UTC (rev 30275)
@@ -594,7 +594,7 @@
/* used by metaballs
* doesnt return the original duplicated object, only dupli's
*/
-int next_object(Scene *scene, int val, Base **base, Object **ob)
+int next_object(Scene **scene, int val, Base **base, Object **ob)
{
static ListBase *duplilist= NULL;
static DupliObject *dupob;
@@ -623,17 +623,21 @@
/* the first base */
if(fase==F_START) {
- *base= scene->base.first;
+ *base= (*scene)->base.first;
if(*base) {
*ob= (*base)->object;
fase= F_SCENE;
}
else {
/* exception: empty scene */
- if(scene->set && scene->set->base.first) {
- *base= scene->set->base.first;
- *ob= (*base)->object;
- fase= F_SET;
+ while((*scene)->set) {
+ (*scene)= (*scene)->set;
+ if((*scene)->base.first) {
+ *base= (*scene)->base.first;
+ *ob= (*base)->object;
+ fase= F_SCENE;
+ break;
+ }
}
}
}
@@ -643,11 +647,14 @@
if(*base) *ob= (*base)->object;
else {
if(fase==F_SCENE) {
- /* scene is finished, now do the set */
- if(scene->set && scene->set->base.first) {
- *base= scene->set->base.first;
- *ob= (*base)->object;
- fase= F_SET;
+ /* (*scene) is finished, now do the set */
+ while((*scene)->set) {
+ (*scene)= (*scene)->set;
+ if((*scene)->base.first) {
+ *base= (*scene)->base.first;
+ *ob= (*base)->object;
+ break;
+ }
}
}
}
@@ -662,7 +669,7 @@
this enters eternal loop because of
makeDispListMBall getting called inside of group_duplilist */
if((*base)->object->dup_group == NULL) {
- duplilist= object_duplilist(scene, (*base)->object);
+ duplilist= object_duplilist((*scene), (*base)->object);
dupob= duplilist->first;
@@ -698,6 +705,10 @@
}
}
+ /* if(ob && *ob) {
+ printf("Scene: '%s', '%s'\n", (*scene)->id.name+2, (*ob)->id.name+2);
+ } */
+
/* reset recursion test */
in_next_object= 0;
Modified: branches/render25/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/sequencer.c 2010-07-13 16:06:51 UTC (rev 30274)
+++ branches/render25/source/blender/blenkernel/intern/sequencer.c 2010-07-13 16:11:16 UTC (rev 30275)
@@ -517,6 +517,31 @@
seq_update_sound(scene, seq);
}
+static void seq_update_sound_bounds_recursive(Scene *scene, Sequence *metaseq)
+{
+ Sequence *seq;
+
+ /* for sound we go over full meta tree to update bounds of the sound strips,
+ since sound is played outside of evaluating the imbufs, */
+ for(seq=metaseq->seqbase.first; seq; seq=seq->next) {
+ if(seq->type == SEQ_META) {
+ seq_update_sound_bounds_recursive(scene, seq);
+ }
+ else if((seq->type == SEQ_SOUND) || (seq->type == SEQ_SCENE)) {
+ if(seq->scene_sound) {
+ int startofs = seq->startofs;
+ int endofs = seq->endofs;
+ if(seq->startofs + seq->start < metaseq->start + metaseq->startofs)
+ startofs = metaseq->start + metaseq->startofs - seq->start;
+
+ if(seq->start + seq->len - seq->endofs > metaseq->start + metaseq->len - metaseq->endofs)
+ endofs = seq->start + seq->len - metaseq->start - metaseq->len + metaseq->endofs;
+ sound_move_scene_sound(scene, seq->scene_sound, seq->start + startofs, seq->start+seq->len - endofs, startofs);
+ }
+ }
+ }
+}
+
void calc_sequence(Scene *scene, Sequence *seq)
{
Sequence *seqm;
@@ -576,6 +601,7 @@
new_tstripdata(seq);
}
}
+ seq_update_sound_bounds_recursive(scene, seq);
}
calc_sequence_disp(scene, seq);
}
Modified: branches/render25/source/blender/blenkernel/intern/world.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/world.c 2010-07-13 16:06:51 UTC (rev 30274)
+++ branches/render25/source/blender/blenkernel/intern/world.c 2010-07-13 16:11:16 UTC (rev 30275)
@@ -72,12 +72,12 @@
wrld= alloc_libblock(&G.main->world, ID_WO, name);
- wrld->horr= 0.25f;
- wrld->horg= 0.25f;
- wrld->horb= 0.25f;
- wrld->zenr= 0.1f;
- wrld->zeng= 0.1f;
- wrld->zenb= 0.1f;
+ wrld->horr= 0.05f;
+ wrld->horg= 0.05f;
+ wrld->horb= 0.05f;
+ wrld->zenr= 0.01f;
+ wrld->zeng= 0.01f;
+ wrld->zenb= 0.01f;
wrld->skytype= 0;
wrld->stardist= 15.0f;
wrld->starsize= 2.0f;
@@ -97,6 +97,8 @@
wrld->ao_shading_method = WO_LIGHT_SHADE_ONCE;
wrld->preview = NULL;
+ wrld->miststa = 5.0f;
+ wrld->mistdist = 25.0f;
return wrld;
}
Deleted: branches/render25/source/blender/editors/datafiles/B.blend.c
===================================================================
--- branches/render25/source/blender/editors/datafiles/B.blend.c 2010-07-13 16:06:51 UTC (rev 30274)
+++ branches/render25/source/blender/editors/datafiles/B.blend.c 2010-07-13 16:11:16 UTC (rev 30275)
@@ -1,13006 +0,0 @@
-/* DataToC output of file <B_blend> */
-
-int datatoc_B_blend_size= 415988;
-char datatoc_B_blend[]= {
- 66, 76, 69, 78, 68, 69, 82, 45,118, 50, 53, 50, 82, 69, 78, 68, 32, 0, 0, 0,
- 32,237,191, 95,255,127, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,250, 0, 0, 0, 83, 99,101,110,101, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 76, 79, 66, 24, 1, 0, 0, 32,236,191, 95,255,127, 0, 0,
-200, 0, 0, 0, 1, 0, 0, 0, 32, 32, 32, 53, 5, 0, 0, 0,250, 0, 0, 0, 1, 0, 0, 1,168,175,123, 26, 1, 0, 0, 0,
- 56,186,171, 3, 1, 0, 0, 0, 0, 16, 0, 0,128, 32, 4, 0, 60,109,101,109,111,114,121, 50, 62, 0, 0, 0, 0, 0, 0, 0,
- 32, 0, 0, 0, 0, 0, 0, 0, 32,237,191, 95,255,127, 0, 0, 92,170, 54, 4, 1, 0, 0, 0,176,236,191, 95,255,127, 0, 0,
-178,155,100, 0, 1, 0, 0, 0,144,236,191, 95,255,127, 0, 0,216, 48, 56, 4, 32, 0, 0, 0, 32,237,191, 95,255,127, 0, 0,
- 88, 29,114, 26, 1, 0, 0, 0,208,236,191, 95,255,127, 0, 0, 56,170, 54, 4, 1, 0, 0, 0, 0,237,191, 95,255,127, 0, 0,
- 41,158,100, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 32,237,191, 95,255,127, 0, 0, 32, 0, 0, 0, 82, 69, 78, 68,
- 88, 29,114, 26, 1, 0, 0, 0, 82, 69, 78, 68, 32, 0, 0, 0, 32,237,191, 95,255,127, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list