[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28226] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blend -r28211: 28225
Campbell Barton
ideasman42 at gmail.com
Fri Apr 16 10:35:50 CEST 2010
Revision: 28226
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28226
Author: campbellbarton
Date: 2010-04-16 10:35:50 +0200 (Fri, 16 Apr 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blend -r28211:28225
Modified Paths:
--------------
branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/render25/release/scripts/ui/properties_material.py
branches/render25/source/blender/blenkernel/intern/pointcache.c
branches/render25/source/blender/blenlib/intern/math_geom_inline.c
branches/render25/source/blender/editors/curve/editcurve.c
branches/render25/source/blender/editors/datafiles/B.blend.c
branches/render25/source/blender/editors/gpencil/gpencil_edit.c
branches/render25/source/blender/editors/include/ED_object.h
branches/render25/source/blender/editors/mesh/editmesh_add.c
branches/render25/source/blender/editors/mesh/loopcut.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/render/render_preview.c
branches/render25/source/blender/editors/space_file/filesel.c
branches/render25/source/blender/editors/space_view3d/view3d_draw.c
branches/render25/source/blender/editors/space_view3d/view3d_edit.c
branches/render25/source/blender/editors/space_view3d/view3d_intern.h
branches/render25/source/blender/editors/space_view3d/view3d_view.c
branches/render25/source/blender/python/generic/mathutils.h
branches/render25/source/blender/python/generic/mathutils_color.h
branches/render25/source/blender/python/generic/mathutils_euler.h
branches/render25/source/blender/python/generic/mathutils_matrix.c
branches/render25/source/blender/python/generic/mathutils_matrix.h
branches/render25/source/blender/python/generic/mathutils_quat.h
branches/render25/source/blender/python/generic/mathutils_vector.h
branches/render25/source/blender/windowmanager/intern/wm_files.c
Property Changed:
----------------
branches/render25/source/blender/blenlib/intern/math_geom_inline.c
Modified: branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
===================================================================
--- branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj 2010-04-16 08:17:13 UTC (rev 28225)
+++ branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj 2010-04-16 08:35:50 UTC (rev 28226)
@@ -584,6 +584,10 @@
>
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\intern\math_geom_inline.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\math_matrix.c"
>
</File>
Modified: branches/render25/release/scripts/ui/properties_material.py
===================================================================
--- branches/render25/release/scripts/ui/properties_material.py 2010-04-16 08:17:13 UTC (rev 28225)
+++ branches/render25/release/scripts/ui/properties_material.py 2010-04-16 08:35:50 UTC (rev 28226)
@@ -912,8 +912,34 @@
col = split.column()
col.label()
col.prop(vol, "depth_cutoff")
+
+class MATERIAL_PT_volume_options(VolumeButtonsPanel):
+ bl_label = "Options"
+ COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
+ bl_default_closed = True
+ def draw(self, context):
+ layout = self.layout
+ mat = active_node_mat(context.material)
+ wide_ui = context.region.width > narrowui
+
+ split = layout.split()
+
+ col = split.column()
+ col.prop(mat, "traceable")
+ col.prop(mat, "full_oversampling")
+ col.prop(mat, "exclude_mist")
+
+ col = split.column()
+ col.label(text="Light Group:")
+ col.prop(mat, "light_group", text="")
+ row = col.row()
+ row.active = bool(mat.light_group)
+ row.prop(mat, "light_group_exclusive", text="Exclusive")
+
+
+
classes = [
MATERIAL_PT_context_material,
MATERIAL_PT_preview,
@@ -938,8 +964,8 @@
MATERIAL_PT_volume_shading,
MATERIAL_PT_volume_lighting,
MATERIAL_PT_volume_transp,
-
MATERIAL_PT_volume_integration,
+ MATERIAL_PT_volume_options,
MATERIAL_PT_custom_props]
Modified: branches/render25/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/pointcache.c 2010-04-16 08:17:13 UTC (rev 28225)
+++ branches/render25/source/blender/blenkernel/intern/pointcache.c 2010-04-16 08:35:50 UTC (rev 28226)
@@ -2434,7 +2434,7 @@
cache->flag &= ~PTCACHE_BAKED;
}
}
- for(SETLOOPER(scene, base)) {
+ else for(SETLOOPER(scene, base)) {
/* cache/bake everything in the scene */
BKE_ptcache_ids_from_object(&pidlist, base->object, scene, MAX_DUPLI_RECUR);
Modified: branches/render25/source/blender/blenlib/intern/math_geom_inline.c
===================================================================
--- branches/render25/source/blender/blenlib/intern/math_geom_inline.c 2010-04-16 08:17:13 UTC (rev 28225)
+++ branches/render25/source/blender/blenlib/intern/math_geom_inline.c 2010-04-16 08:35:50 UTC (rev 28226)
@@ -1,5 +1,5 @@
/**
- * $Id: math_base_inline.c 26367 2010-01-28 16:02:26Z blendix $
+ * $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
Property changes on: branches/render25/source/blender/blenlib/intern/math_geom_inline.c
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: branches/render25/source/blender/editors/curve/editcurve.c
===================================================================
--- branches/render25/source/blender/editors/curve/editcurve.c 2010-04-16 08:17:13 UTC (rev 28225)
+++ branches/render25/source/blender/editors/curve/editcurve.c 2010-04-16 08:35:50 UTC (rev 28226)
@@ -3726,7 +3726,7 @@
static int select_linked_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
- RegionView3D *rv3d= CTX_wm_region_view3d(C);
+ RegionView3D *rv3d= ED_view3d_context_rv3d(C);
ViewContext vc;
Nurb *nu;
BezTriple *bezt;
Modified: branches/render25/source/blender/editors/datafiles/B.blend.c
===================================================================
--- branches/render25/source/blender/editors/datafiles/B.blend.c 2010-04-16 08:17:13 UTC (rev 28225)
+++ branches/render25/source/blender/editors/datafiles/B.blend.c 2010-04-16 08:35:50 UTC (rev 28226)
@@ -1,140 +1,140 @@
/* DataToC output of file <B_blend> */
-int datatoc_B_blend_size= 406288;
+int datatoc_B_blend_size= 406224;
char datatoc_B_blend[]= {
66, 76, 69, 78, 68, 69, 82, 45,118, 50, 53, 50, 82, 69, 78, 68,
- 32, 0, 0, 0, 96,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,112,236,191, 95,
-255,127, 0, 0,200, 0, 0, 0, 1, 0, 0, 0, 32, 32, 32, 52, 4, 0, 0, 0,250, 0, 0, 0, 1, 0, 0, 1,160,161, 58, 30,
- 1, 0, 0, 0, 48, 6,182, 29, 1, 0, 0, 0, 0, 16, 0, 0,128, 0, 4, 0, 60,109,101,109,111,114,121, 50, 62, 0, 0, 0,
- 0, 0, 0, 0, 34, 26,242, 1, 1, 0, 0, 0, 40, 0, 0, 0, 48, 0, 0, 0,160,237,191, 95,255,127, 0, 0,208,236,191, 95,
-255,127, 0, 0,208,134,105, 29, 32, 0, 0, 0, 96,237,191, 95,255,127, 0, 0, 96,239,132, 22, 1, 0, 0, 0, 45, 0, 0, 0,
- 0, 0, 0, 0,118, 0, 0, 0, 0, 0, 0, 0, 64,237,191, 95,255,127, 0, 0, 45, 98, 99, 0, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 96,237,191, 95,255,127, 0, 0, 32, 0, 0, 0, 82, 69, 78, 68, 96,239,132, 22, 1, 0, 0, 0, 82, 69, 78, 68,
- 32, 0, 0, 0, 96,237,191, 95,255,127, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0,144,237,191, 95,255,127, 0, 0,144,237,191, 95,
-255,127, 0, 0, 0,105, 99, 0, 1, 0, 0, 0, 48,178,191, 29, 1, 0, 0, 0, 96,239,132, 22, 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,160,161, 58, 30,
- 1, 0, 0, 0, 87, 77, 0, 0, 16, 1, 0, 0,160,101, 57, 30, 1, 0, 0, 0,108, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ 32, 0, 0, 0,208,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,224,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,144, 73, 76, 30,
+ 1, 0, 0, 0, 48, 22,204, 29, 1, 0, 0, 0, 0, 16, 0, 0,128, 0, 4, 0, 60,109,101,109,111,114,121, 50, 62, 0, 0, 0,
+ 0, 0, 0, 0,162,189,242, 1, 1, 0, 0, 0, 40, 0, 0, 0, 48, 0, 0, 0, 16,238,191, 95,255,127, 0, 0, 64,237,191, 95,
+255,127, 0, 0,208, 86,186, 30, 32, 0, 0, 0,208,237,191, 95,255,127, 0, 0, 96, 23,133, 22, 1, 0, 0, 0, 45, 0, 0, 0,
+ 0, 0, 0, 0,118, 0, 0, 0, 0, 0, 0, 0,176,237,191, 95,255,127, 0, 0, 97, 39, 98, 0, 1, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0,208,237,191, 95,255,127, 0, 0, 32, 0, 0, 0, 82, 69, 78, 68, 96, 23,133, 22, 1, 0, 0, 0, 82, 69, 78, 68,
+ 32, 0, 0, 0,208,237,191, 95,255,127, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,238,191, 95,255,127, 0, 0, 0,238,191, 95,
+255,127, 0, 0, 52, 46, 98, 0, 1, 0, 0, 0, 48,132,189, 29, 1, 0, 0, 0, 96, 23,133, 22, 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,144, 73, 76, 30,
+ 1, 0, 0, 0, 87, 77, 0, 0, 16, 1, 0, 0,240,211, 72, 30, 1, 0, 0, 0,108, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 87, 77, 87,105,
110, 77, 97,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0,240,102, 57, 30, 1, 0, 0, 0,240,102, 57, 30, 1, 0, 0, 0,240,102, 57, 30, 1, 0, 0, 0,240,102, 57, 30,
- 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0,192, 65, 57, 30, 1, 0, 0, 0,112,204,133, 22, 1, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,240, 60, 50, 30, 1, 0, 0, 0,176,225,133, 22, 1, 0, 0, 0, 2, 0, 0, 0,
- 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64, 82, 57, 30,
- 1, 0, 0, 0, 64, 82, 57, 30, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,192,108,143, 22,
- 1, 0, 0, 0,192,108,143, 22, 1, 0, 0, 0,192,108,143, 22, 1, 0, 0, 0,224, 94, 88, 29, 1, 0, 0, 0,224, 94, 88, 29,
- 1, 0, 0, 0,224, 94, 88, 29, 1, 0, 0, 0, 68, 65, 84, 65,224, 0, 0, 0,240,102, 57, 30, 1, 0, 0, 0,109, 1, 0, 0,
- 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,208,101,128, 22, 1, 0, 0, 0, 1, 0, 0, 0,
- 0, 0, 0, 0,160,161, 58, 30, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,115, 99,114,101,101,110, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64,213, 72, 30, 1, 0, 0, 0, 64,213, 72, 30,
+ 1, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0,
+ 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 64,111,128, 22,
+ 1, 0, 0, 0, 64,111,128, 22, 1, 0, 0, 0, 64,111,128, 22, 1, 0, 0, 0,240,179,104, 29, 1, 0, 0, 0,240,179,104, 29,
+ 1, 0, 0, 0,240,179,104, 29, 1, 0, 0, 0, 68, 65, 84, 65,224, 0, 0, 0, 64,213, 72, 30, 1, 0, 0, 0,109, 1, 0, 0,
+ 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 16,126,128, 22, 1, 0, 0, 0, 1, 0, 0, 0,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list