Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-11-22 22:03:33 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-22 22:03:33 +0400
commitb78701f6fe1daa33c38a7b72563565c09677f325 (patch)
treecbc66cc2cac620e73754ec08eef2adb2ff8be96f /release
parentb450d3c3b6585cefe52d007c0088c4dc7b2e78ec (diff)
ocean sim
- UV's were not being calculated if there were too many VColor layers. - precalc (omd->size * omd->spatial_size) was being called in a loop. - use vector functions to avoid pointer indrections on each access which the compiler wont optimize - eg: och->ibufs_disp[f]->rect_float[4*(res_x*j + i) + 1] - dont call abs() on ints (converts to double and back to int in this case). also unrelated render buttons change. move saving options directly under the file path since these were easy to confuse with image format options like zbuf, ycc, preview.. etc.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_render.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 2d731164713..57df602f19a 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -456,13 +456,14 @@ class RENDER_PT_output(RenderButtonsPanel, Panel):
file_format = rd.image_settings.file_format
layout.prop(rd, "filepath", text="")
- layout.template_image_settings(rd.image_settings)
flow = layout.column_flow()
flow.prop(rd, "use_overwrite")
flow.prop(rd, "use_placeholder")
flow.prop(rd, "use_file_extension")
+ layout.template_image_settings(rd.image_settings)
+
if file_format == 'QUICKTIME_CARBON':
layout.operator("scene.render_data_set_quicktime_codec")