[Bf-blender-cvs] [8bd84d8] gooseberry: Merge branch 'alembic' into gooseberry

[Lukas Tönne]

Commit: 8bd84d8ec9d1b4b6733cb9602242c20c987f263c
Author: Lukas Tönne
Date:   Tue Apr 21 17:31:55 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB8bd84d8ec9d1b4b6733cb9602242c20c987f263c

Merge branch 'alembic' into gooseberry

Conflicts:
	source/blender/editors/space_view3d/drawvolume.c

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



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

diff --cc source/blender/editors/space_view3d/drawvolume.c
index 7b047df,d6691f4..2ee1241
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@@ -105,8 -105,7 +105,8 @@@ void draw_smoke_volume(SmokeDomainSetti
  	float cor[3] = {1.0f, 1.0f, 1.0f};
  	int gl_depth = 0, gl_blend = 0;
  
- 	int use_fire = (sds->active_fields & SM_ACTIVE_FIRE);
+ 	const bool use_fire = (sds->active_fields & SM_ACTIVE_FIRE) != 0;
 +	const float thickness = sds->display_thickness;
  
  	/* draw slices of smoke is adapted from c++ code authored
  	 * by: Johannes Schmid and Ingemar Rask, 2006, johnny at grob.org */