[Bf-blender-cvs] [a568de8] gooseberry: Merge branch 'master' into gooseberry

Antony Riakiotakis noreply at git.blender.org
Fri Mar 20 15:45:18 CET 2015


Commit: a568de8a837328a7acb555bedf4147a806f5fe96
Author: Antony Riakiotakis
Date:   Fri Mar 20 15:45:11 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBa568de8a837328a7acb555bedf4147a806f5fe96

Merge branch 'master' into gooseberry

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/properties_data_camera.py
index c3ed34d,6a0d680..61ab51a
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@@ -187,34 -188,15 +188,38 @@@ class DATA_PT_camera_dof(CameraButtonsP
  
          col = split.column()
          col.prop(dof_options, "fstop")
+ 
          sub = col.column()
-         sub.active = cam.dof_object is None
+         sub.active = (cam.dof_object is None)
          sub.prop(cam, "dof_distance", text="Distance")
  
+         if dof_options.use_high_quality:
+             col.prop(dof_options, "blades")
+ 
  
 +class DATA_PT_camera_gpu_dof(Panel):
 +    bl_label = "GPU Depth of Field"
 +    bl_space_type = 'PROPERTIES'
 +    bl_region_type = 'WINDOW'
 +    bl_context = "data"
 +
 +    def draw(self, context):
 +        layout = self.layout
 +
 +        cam = context.camera
 +
 +        dof_options = cam.gpu_dof
 +        col = layout.column(align=True)
 +        col.label("Focus object or distance is set in Depth Of Field Panel")
 +        col.prop(dof_options, "dof_fstop")
 +        col.prop(dof_options, "dof_focal_length")
 +        col.prop(dof_options, "dof_sensor")
 +
 +    @classmethod
 +    def poll(cls, context):
 +        return context.camera
 +
 +
  class DATA_PT_camera_display(CameraButtonsPanel, Panel):
      bl_label = "Display"
      COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
diff --cc source/blender/gpu/intern/gpu_compositing.c
index 6ed6a45,53ce514..b518940
--- a/source/blender/gpu/intern/gpu_compositing.c
+++ b/source/blender/gpu/intern/gpu_compositing.c
@@@ -279,9 -291,10 +291,9 @@@ static GPUTexture * create_jitter_textu
  		normalize_v2(jitter[i]);
  	}
  
- 	return GPU_texture_create_2D_procedural(64, 64, &jitter[0][0], NULL);
+ 	return GPU_texture_create_2D_procedural(64, 64, &jitter[0][0], true, NULL);
  }
  
 -
  bool GPU_fx_compositor_initialize_passes(
          GPUFX *fx, const rcti *rect, const rcti *scissor_rect,
          const GPUFXSettings *fx_settings)




More information about the Bf-blender-cvs mailing list