[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11073] branches/2-44-stable/blender: branches/2-44-stable
Diego Borghetti (Plumiferos)
bdiego at gmail.com
Tue Jun 26 17:24:02 CEST 2007
Revision: 11073
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11073
Author: bdiego
Date: 2007-06-26 17:24:02 +0200 (Tue, 26 Jun 2007)
Log Message:
-----------
branches/2-44-stable
Merge from trunk:
revision 11005:11006
Setting object layers didnt break once the base of an object was found.
DAG update and countall ran even when the object wasnt in the scene.
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11006
revision 11041:11042
Small Makefile fix for verse.
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11042
revision 10728:10729
Disable SSS better for preview rendering, so it does not slow down other
preview renders at all.
NOTE: i know that this is not a "fix" but i think that this is need
for the stable branch (functional fixes).
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10729
revision 10848:10849
Fix error in the version patch for the SSS scene flag.
Link: http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10849
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11005
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11041
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10728
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=10848
Modified Paths:
--------------
branches/2-44-stable/blender/extern/verse/Makefile
branches/2-44-stable/blender/source/blender/blenkernel/BKE_blender.h
branches/2-44-stable/blender/source/blender/blenloader/intern/readfile.c
branches/2-44-stable/blender/source/blender/makesdna/DNA_scene_types.h
branches/2-44-stable/blender/source/blender/python/api2_2x/Object.c
branches/2-44-stable/blender/source/blender/render/intern/source/convertblender.c
branches/2-44-stable/blender/source/blender/src/previewrender.c
Modified: branches/2-44-stable/blender/extern/verse/Makefile
===================================================================
--- branches/2-44-stable/blender/extern/verse/Makefile 2007-06-26 15:15:41 UTC (rev 11072)
+++ branches/2-44-stable/blender/extern/verse/Makefile 2007-06-26 15:24:02 UTC (rev 11073)
@@ -34,6 +34,7 @@
DIRS = dist
include nan_subdirs.mk
+include nan_compile.mk
include nan_link.mk
DISTDIR = dist
@@ -53,5 +54,5 @@
ifeq ($(OS),darwin)
ranlib $(NAN_VERSE)/lib/libverse.a
endif
- $(CC) $(LDFLAGS) -o $(DIR)/verse$(EXT) $(DIR)/libverse.a $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS)
+ $(CCC) $(LDFLAGS) -o $(DIR)/verse$(EXT) $(DIR)/libverse.a $(LIBS) $(SLIBS) $(LLIBS) $(DADD) $(LOPTS)
@$(CP) $(DIR)/verse$(EXT) $(OCGDIR)/bin
Modified: branches/2-44-stable/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/2-44-stable/blender/source/blender/blenkernel/BKE_blender.h 2007-06-26 15:15:41 UTC (rev 11072)
+++ branches/2-44-stable/blender/source/blender/blenkernel/BKE_blender.h 2007-06-26 15:24:02 UTC (rev 11073)
@@ -44,7 +44,7 @@
struct MemFile;
#define BLENDER_VERSION 244
-#define BLENDER_SUBVERSION 0
+#define BLENDER_SUBVERSION 1
#define BLENDER_MINVERSION 240
#define BLENDER_MINSUBVERSION 0
Modified: branches/2-44-stable/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/2-44-stable/blender/source/blender/blenloader/intern/readfile.c 2007-06-26 15:15:41 UTC (rev 11072)
+++ branches/2-44-stable/blender/source/blender/blenloader/intern/readfile.c 2007-06-26 15:24:02 UTC (rev 11073)
@@ -6462,7 +6462,15 @@
customdata_version_243(me);
}
}
+ if(main->versionfile <= 244) {
+ Scene *sce;
+ if(main->versionfile != 244 || main->subversionfile < 1) {
+ for(sce= main->scene.first; sce; sce= sce->id.next)
+ sce->r.mode |= R_SSS;
+ }
+ }
+
/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
/* WATCH IT 2!: Userdef struct init has to be in src/usiblender.c! */
Modified: branches/2-44-stable/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- branches/2-44-stable/blender/source/blender/makesdna/DNA_scene_types.h 2007-06-26 15:15:41 UTC (rev 11072)
+++ branches/2-44-stable/blender/source/blender/makesdna/DNA_scene_types.h 2007-06-26 15:24:02 UTC (rev 11073)
@@ -486,6 +486,7 @@
/* threads obsolete... is there for old files */
#define R_THREADS 0x80000
#define R_SPEED 0x100000
+#define R_SSS 0x200000
/* filtertype */
#define R_FILTER_BOX 0
Modified: branches/2-44-stable/blender/source/blender/python/api2_2x/Object.c
===================================================================
--- branches/2-44-stable/blender/source/blender/python/api2_2x/Object.c 2007-06-26 15:15:41 UTC (rev 11072)
+++ branches/2-44-stable/blender/source/blender/python/api2_2x/Object.c 2007-06-26 15:24:02 UTC (rev 11073)
@@ -1236,7 +1236,9 @@
}
base = base->next;
}
- countall( );
+ if(base) { /* was the object selected? */
+ countall( );
+ }
return 0;
}
@@ -4264,13 +4266,16 @@
local = base->lay;
base->lay = local | layers;
self->object->lay = base->lay;
+ break;
}
base = base->next;
}
/* these to calls here are overkill! (ton) */
- countall();
- DAG_scene_sort( G.scene );
+ if(base) { /* The object was found? */
+ countall();
+ DAG_scene_sort( G.scene );
+ }
return 0;
}
@@ -4300,11 +4305,14 @@
local = base->lay;
base->lay = local | layers;
self->object->lay = base->lay;
+ break;
}
base = base->next;
}
- countall();
- DAG_scene_sort( G.scene );
+ if(base) { /* The object was found? */
+ countall();
+ DAG_scene_sort( G.scene );
+ }
return 0;
}
Modified: branches/2-44-stable/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/2-44-stable/blender/source/blender/render/intern/source/convertblender.c 2007-06-26 15:15:41 UTC (rev 11072)
+++ branches/2-44-stable/blender/source/blender/render/intern/source/convertblender.c 2007-06-26 15:24:02 UTC (rev 11073)
@@ -3483,7 +3483,7 @@
project_renderdata(re, projectverto, re->r.mode & R_PANORAMA, 0);
/* SSS */
- if(!re->test_break())
+ if((re->r.mode & R_SSS) && !re->test_break())
if (re->r.renderer==R_INTERN)
make_sss_tree(re);
}
Modified: branches/2-44-stable/blender/source/blender/src/previewrender.c
===================================================================
--- branches/2-44-stable/blender/source/blender/src/previewrender.c 2007-06-26 15:15:41 UTC (rev 11072)
+++ branches/2-44-stable/blender/source/blender/src/previewrender.c 2007-06-26 15:24:02 UTC (rev 11073)
@@ -283,6 +283,8 @@
/* turn on raytracing if needed */
if(mat->mode_l & (MA_RAYTRANSP|MA_RAYMIRROR))
sce->r.mode |= R_RAYTRACE;
+ if(mat->sss_flag & MA_DIFF_SSS)
+ sce->r.mode |= R_SSS;
/* turn off fake shadows if needed */
/* this only works in a specific case where the preview.blend contains
@@ -314,7 +316,7 @@
}
}
else {
- sce->r.mode &= ~(R_OSA|R_RAYTRACE);
+ sce->r.mode &= ~(R_OSA|R_RAYTRACE|R_SSS);
}
for(base= sce->base.first; base; base= base->next) {
More information about the Bf-blender-cvs
mailing list