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

Lukas Tönne noreply at git.blender.org
Mon Feb 2 14:24:18 CET 2015


Commit: 92fdd1efdfaa07f55b678fb470d633bda0766f18
Author: Lukas Tönne
Date:   Mon Feb 2 14:23:35 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB92fdd1efdfaa07f55b678fb470d633bda0766f18

Merge branch 'master' into gooseberry

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



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

diff --cc source/blender/editors/space_view3d/view3d_draw.c
index 1cead62,67c6eb4..40d4201
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -2836,11 -2820,9 +2836,11 @@@ void ED_view3d_draw_offscreen_init(Scen
   */
  static void view3d_main_area_clear(Scene *scene, View3D *v3d, ARegion *ar, bool force)
  {
 +	const bool is_wire_color = V3D_IS_WIRECOLOR(scene, v3d);
 +
  	/* clear background */
  	if (scene->world && ((v3d->flag3 & V3D_SHOW_WORLD) || force)) {
- 		float alpha = (force) ? 1.0f : 0.0;
+ 		float alpha = (force) ? 1.0f : 0.0f;
  		bool glsl = GPU_glsl_support() && BKE_scene_use_new_shading_nodes(scene) && scene->world->nodetree && scene->world->use_nodes;
  		
  		if (glsl) {




More information about the Bf-blender-cvs mailing list