[Bf-blender-cvs] [65b930af39b] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 65b930af39bd3c89a2aed97d238c669d8788a892
Author: Campbell Barton
Date:   Tue Dec 11 13:10:56 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB65b930af39bd3c89a2aed97d238c669d8788a892

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/makesrna/intern/rna_camera.c
index 1e68ab65965,c1a76b1627a..aee14cd3185
--- a/source/blender/makesrna/intern/rna_camera.c
+++ b/source/blender/makesrna/intern/rna_camera.c
@@@ -44,9 -42,21 +44,21 @@@
  #include "BKE_object.h"
  #include "BKE_sequencer.h"
  
 -#include "WM_api.h"
 +#include "DEG_depsgraph.h"
 +#include "DEG_depsgraph_build.h"
  
+ static float rna_Camera_draw_size_get(PointerRNA *ptr)
+ {
+ 	Camera *cam = ptr->id.data;
+ 	return cam->drawsize * 2.0f;
+ }
+ 
+ static void rna_Camera_draw_size_set(PointerRNA *ptr, float value)
+ {
+ 	Camera *cam = ptr->id.data;
+ 	cam->drawsize = value / 2.0f;
+ }
+ 
  static float rna_Camera_angle_get(PointerRNA *ptr)
  {
  	Camera *cam = ptr->id.data;
@@@ -501,12 -320,15 +513,16 @@@ void RNA_def_camera(BlenderRNA *brna
  	RNA_def_property_ui_text(prop, "Orthographic Scale", "Orthographic Camera scale (similar to zoom)");
  	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, "rna_Camera_update");
  
 -	prop = RNA_def_property(srna, "draw_size", PROP_FLOAT, PROP_DISTANCE);
 +	prop = RNA_def_property(srna, "display_size", PROP_FLOAT, PROP_DISTANCE);
+ #if 0
  	RNA_def_property_float_sdna(prop, NULL, "drawsize");
+ #else
+ 	RNA_def_property_float_funcs(prop, "rna_Camera_draw_size_get", "rna_Camera_draw_size_set", NULL);
+ #endif
 +	RNA_def_property_float_default(prop, 1.0f);
  	RNA_def_property_range(prop, 0.01f, 1000.0f);
  	RNA_def_property_ui_range(prop, 0.01, 100, 1, 2);
 -	RNA_def_property_ui_text(prop, "Draw Size", "Apparent size of the Camera object in the 3D View");
 +	RNA_def_property_ui_text(prop, "Display Size", "Apparent size of the Camera object in the 3D View");
  	RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
  
  	prop = RNA_def_property(srna, "shift_x", PROP_FLOAT, PROP_NONE);