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

[Lukas Tönne]

Commit: ad3e6ecfb4173c98ac1abbe03a62393202c69ee9
Author: Lukas Tönne
Date:   Wed Mar 25 20:10:02 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBad3e6ecfb4173c98ac1abbe03a62393202c69ee9

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/editors/render/render_opengl.c

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



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

diff --cc source/blender/editors/render/render_opengl.c
index d40ced2,d8da0e9..2bcb9ef
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@@ -223,8 -223,12 +223,13 @@@ static void screen_opengl_render_apply(
  			/*int is_ortho = scene->r.mode & R_ORTHO;*/
  			camera = v3d->camera;
  			RE_GetCameraWindow(oglrender->re, camera, scene->r.cfra, winmat);
- 			is_persp = true;
+ 			if (camera->type == OB_CAMERA) {
+ 				Camera *cam = camera->data;
+ 				is_persp = cam->type == CAM_PERSP;
+ 			}
+ 			else
+ 				is_persp = true;
 +
  			BKE_camera_to_gpu_dof(camera, &fx_settings);
  		}
  		else {
diff --cc source/blender/editors/space_view3d/drawobject.c
index da5108c,808408b..281fbe6
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@@ -5134,18 -4754,21 +5135,24 @@@ static void draw_new_particle_system(Sc
  	/* don't draw normal paths in edit mode */
  	if (psys_in_edit_mode(scene, psys) && (pset->flag & PE_DRAW_PART) == 0)
  		return;
 -
 -	if (part->draw_as == PART_DRAW_REND)
 -		draw_as = part->ren_as;
 -	else
 -		draw_as = part->draw_as;
 -
 -	if (draw_as == PART_DRAW_NOT)
 +	
 +	draw_as = part->draw_as == PART_DRAW_REND ? part->ren_as : part->draw_as;
 +	if (draw_as == PART_DRAW_NOT) {
  		return;
 +	}
 +	else if (draw_as == PART_DRAW_HULL) {
 +#ifdef USE_PARTICLE_HULL_DRAWING
 +		draw_particle_hair_hull(scene, v3d, rv3d, base, psys, ob_dt, dflag);
 +#endif
 +		return;
 +	}
  
+ 	/* prepare curvemapping tables */
+ 	if ((psys->part->child_flag & PART_CHILD_USE_CLUMP_CURVE) && psys->part->clumpcurve)
+ 		curvemapping_changed_all(psys->part->clumpcurve);
+ 	if ((psys->part->child_flag & PART_CHILD_USE_ROUGH_CURVE) && psys->part->roughcurve)
+ 		curvemapping_changed_all(psys->part->roughcurve);
+ 
  /* 2. */
  	sim.scene = scene;
  	sim.ob = ob;