diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2013-01-27 23:57:47 +0400 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2013-01-27 23:57:47 +0400 |
commit | 0976a780ebc259b740afda528e4f2c0ad4a9b3a2 (patch) | |
tree | b8feb0c8123557ceec2da698e4a7ae1f4270da7d | |
parent | a2e55171fee184c6fb908f2775cf3a09404acc7b (diff) |
BGE UI: removing "use_occlusion_culling" from the ui
(and marking rna as deprecated)
I talked with Benoit Bolsee and Mitchell Stokes and they both agreed that
the feature should be removed.
In case someone was actually using it the rna is still available. But next
release we remove both the rna, the DNA and the flag in the code.
I did a simple benchmark with tons of cubes, and the DBVT culling (use_occlusion_culling=True)
always perform better than when it's off. Even when no occluder objects are in the scene.
-rw-r--r-- | release/scripts/startup/bl_ui/properties_game.py | 10 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index a896855b217..1f05c8eea5a 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -621,7 +621,9 @@ class WORLD_PT_game_physics(WorldButtonsPanel, Panel): layout.prop(gs, "physics_engine") if gs.physics_engine != 'NONE': - layout.prop(gs, "physics_gravity", text="Gravity") + col = layout.column() + col.prop(gs, "physics_gravity", text="Gravity") + col.prop(gs, "occlusion_culling_resolution", text="Culling Resolution") split = layout.split() @@ -644,12 +646,6 @@ class WORLD_PT_game_physics(WorldButtonsPanel, Panel): sub = col.row() sub.prop(gs, "deactivation_time", text="Time") - col = layout.column() - col.prop(gs, "use_occlusion_culling", text="Occlusion Culling") - sub = col.column() - sub.active = gs.use_occlusion_culling - sub.prop(gs, "occlusion_culling_resolution", text="Resolution") - else: split = layout.split() diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 0f366d27a93..d8bc3d655f7 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2686,10 +2686,12 @@ static void rna_def_scene_game_data(BlenderRNA *brna) RNA_def_property_update(prop, NC_SCENE, NULL); /* mode */ + /* not used *//* deprecated !!!!!!!!!!!!! */ prop = RNA_def_property(srna, "use_occlusion_culling", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", WO_DBVT_CULLING); - RNA_def_property_ui_text(prop, "DBVT culling", - "Use optimized Bullet DBVT tree for view frustum and occlusion culling"); + RNA_def_property_ui_text(prop, "DBVT Culling", + "Use optimized Bullet DBVT tree for view frustum and occlusion culling " + "(more efficient, but it can waste unecessary CPU if the scene doesn't have Occluder objects"); /* not used *//* deprecated !!!!!!!!!!!!! */ prop = RNA_def_property(srna, "use_activity_culling", PROP_BOOLEAN, PROP_NONE); |