[Bf-blender-cvs] [3dda7a4] fracture_modifier: Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier

[Martin Felke]

Commit: 3dda7a4312e2f0d3cd348d1cad575e4bcb9a54d9
Author: Martin Felke
Date:   Sat Jan 24 13:15:58 2015 +0100
Branches: fracture_modifier
https://developer.blender.org/rB3dda7a4312e2f0d3cd348d1cad575e4bcb9a54d9

Merge remote-tracking branch 'refs/remotes/origin/master' into fracture_modifier

Conflicts:
	source/blender/editors/space_outliner/outliner_draw.c
	source/blender/makesdna/DNA_modifier_types.h
	source/blender/makesrna/intern/rna_modifier.c
	source/blender/modifiers/MOD_modifiertypes.h
	source/blender/modifiers/intern/MOD_util.c (reverse-merged from commit 4401500cac4d3ff6e29d8ba4cbc476df49d88424)

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



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

diff --cc intern/cycles/render/mesh.cpp
index 815ecb3,7f9bb85..9aa0cbc
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@@ -1031,9 -1028,25 +1032,26 @@@ void MeshManager::device_update_bvh(Dev
  	}
  
  	dscene->data.bvh.root = pack.root_index;
 +	dscene->data.bvh.use_qbvh = scene->params.use_qbvh;
  }
  
+ void MeshManager::device_update_flags(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress)
+ {
+ 	if(!need_update && !need_flags_update) {
+ 		return;
+ 	}
+ 	/* update flags */
+ 	foreach(Mesh *mesh, scene->meshes) {
+ 		mesh->has_volume = false;
+ 		foreach(uint shader, mesh->used_shaders) {
+ 			if(scene->shaders[shader]->has_volume) {
+ 				mesh->has_volume = true;
+ 			}
+ 		}
+ 	}
+ 	need_flags_update = false;
+ }
+ 
  void MeshManager::device_update(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress)
  {
  	if(!need_update)
diff --cc source/blender/makesrna/intern/rna_object_api.c
index fa356ed,b743757..1b4bc10
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@@ -109,31 -109,9 +109,31 @@@ static void rna_Scene_mat_convert_space
  		}
  	}
  
- 	BKE_constraint_mat_convertspace(ob, pchan, (float (*)[4])mat_ret, from, to);
+ 	BKE_constraint_mat_convertspace(ob, pchan, (float (*)[4])mat_ret, from, to, false);
  }
  
 +static void rna_Object_calc_matrix_camera(
 +        Object *ob, float mat_ret[16], int width, int height, float scalex, float scaley)
 +{
 +	CameraParams params;
 +
 +	/* setup parameters */
 +	BKE_camera_params_init(&params);
 +	BKE_camera_params_from_object(&params, ob);
 +
 +	/* compute matrix, viewplane, .. */
 +	BKE_camera_params_compute_viewplane(&params, width, height, scalex, scaley);
 +	BKE_camera_params_compute_matrix(&params);
 +
 +	copy_m4_m4((float (*)[4])mat_ret, params.winmat);
 +}
 +
 +static void rna_Object_camera_fit_coords(
 +        Object *ob, Scene *scene, int num_cos, float *cos, float co_ret[3], float *scale_ret)
 +{
 +	BKE_camera_view_frame_fit_to_coords(scene, (float (*)[3])cos, num_cos / 3, ob, co_ret, scale_ret);
 +}
 +
  /* copied from Mesh_getFromObject and adapted to RNA interface */
  /* settings: 0 - preview, 1 - render */
  static Mesh *rna_Object_to_mesh(