[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23637] branches/soc-2009-jaguarandi: Raytrace Acceleration: small tweak to RNA and UI, hiding buttons

Brecht Van Lommel brecht at blender.org
Mon Oct 5 18:18:10 CEST 2009


Revision: 23637
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23637
Author:   blendix
Date:     2009-10-05 18:18:08 +0200 (Mon, 05 Oct 2009)

Log Message:
-----------
Raytrace Acceleration: small tweak to RNA and UI, hiding buttons
when they are not applicable.

Modified Paths:
--------------
    branches/soc-2009-jaguarandi/release/scripts/ui/buttons_scene.py
    branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c

Modified: branches/soc-2009-jaguarandi/release/scripts/ui/buttons_scene.py
===================================================================
--- branches/soc-2009-jaguarandi/release/scripts/ui/buttons_scene.py	2009-10-05 15:59:12 UTC (rev 23636)
+++ branches/soc-2009-jaguarandi/release/scripts/ui/buttons_scene.py	2009-10-05 16:18:08 UTC (rev 23637)
@@ -173,9 +173,11 @@
 		sub.active = rd.render_raytracing
 		sub.itemL(text="Acceleration structure:")
 		sub.itemR(rd, "raytrace_structure", text="")
-		sub.itemR(rd, "use_instances", text="Instance support")
-		sub.itemR(rd, "use_local_coords", text="Local coords")
-		sub.itemR(rd, "octree_resolution", text="Octree resolution")
+		if rd.raytrace_structure == "OCTREE":
+			sub.itemR(rd, "octree_resolution", text="Resolution")
+		else:
+			sub.itemR(rd, "use_instances", text="Instances")
+		sub.itemR(rd, "use_local_coords", text="Local Coordinates")
 
 class SCENE_PT_post_processing(RenderButtonsPanel):
 	__label__ = "Post Processing"

Modified: branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c	2009-10-05 15:59:12 UTC (rev 23636)
+++ branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c	2009-10-05 16:18:08 UTC (rev 23637)
@@ -1179,12 +1179,12 @@
 		{0, NULL, 0, NULL, NULL}};
 
 	static EnumPropertyItem raytrace_structure_items[] = {
-		{R_RAYSTRUCTURE_AUTO, "{R_RAYSTRUCTURE_AUTO", 0, "auto", ""},
-		{R_RAYSTRUCTURE_OCTREE, "R_RAYSTRUCTURE_OCTREE", 0, "octree", "Use old octree structure (no support for instances)"},
-		{R_RAYSTRUCTURE_BLIBVH, "R_RAYSTRUCTURE_BLIBVH", 0, "blibvh", "Use BLI_kdopbvh.c"},
-		{R_RAYSTRUCTURE_VBVH, "R_RAYSTRUCTURE_VBVH", 0, "vBVH", ""},
-		{R_RAYSTRUCTURE_SIMD_SVBVH, "R_RAYSTRUCTURE_SIMD_SVBVH", 0, "SIMD SVBVH", "Requires SIMD"},
-		{R_RAYSTRUCTURE_SIMD_QBVH, "R_RAYSTRUCTURE_SIMD_QBVH", 0, "SIMD QBVH", "Requires SIMD"},
+		{R_RAYSTRUCTURE_AUTO, "AUTO", 0, "Auto", ""},
+		{R_RAYSTRUCTURE_OCTREE, "OCTREE", 0, "Octree", "Use old Octree structure."},
+		{R_RAYSTRUCTURE_BLIBVH, "BLIBVH", 0, "BLI BVH", "Use BLI K-Dop BVH.c"},
+		{R_RAYSTRUCTURE_VBVH, "VBVH", 0, "vBVH", ""},
+		{R_RAYSTRUCTURE_SIMD_SVBVH, "SIMD_SVBVH", 0, "SIMD SVBVH", ""},
+		{R_RAYSTRUCTURE_SIMD_QBVH, "SIMD_QBVH", 0, "SIMD QBVH", ""},
 		{0, NULL, 0, NULL, NULL}
 		};
 
@@ -1632,7 +1632,6 @@
 	RNA_def_property_ui_text(prop, "Use Local Coords", "Vertex coordinates are stored localy on each primitive. Increases memory usage, but may have impact on speed.");
 	RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL);
 
-
 	prop= RNA_def_property(srna, "antialiasing", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "mode", R_OSA);
 	RNA_def_property_ui_text(prop, "Anti-Aliasing", "Render and combine multiple samples per pixel to prevent jagged edges.");





More information about the Bf-blender-cvs mailing list