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

Antony Riakiotakis noreply at git.blender.org
Fri Apr 10 12:48:03 CEST 2015


Commit: c2d6d6d82456cd1113351fe255eaa863a6f5e6f6
Author: Antony Riakiotakis
Date:   Fri Apr 10 12:47:50 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBc2d6d6d82456cd1113351fe255eaa863a6f5e6f6

Merge branch 'master' into gooseberry

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

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



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

diff --cc source/blender/editors/space_view3d/drawvolume.c
index 400fb08,c0d8d13..0726799
--- a/source/blender/editors/space_view3d/drawvolume.c
+++ b/source/blender/editors/space_view3d/drawvolume.c
@@@ -350,24 -281,17 +282,17 @@@ void draw_smoke_volume(SmokeDomainSetti
  	// printf("i: %d\n", i);
  	// printf("point %f, %f, %f\n", cv[i][0], cv[i][1], cv[i][2]);
  
- 	if (GL_TRUE == glewIsSupported("GL_ARB_fragment_program")) {
- 		glEnable(GL_FRAGMENT_PROGRAM_ARB);
- 		glGenProgramsARB(1, &prog);
- 
- 		glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, prog);
- 		/* set shader */
- 		if (sds->active_fields & SM_ACTIVE_COLORS)
- 			glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, (GLsizei)strlen(shader_color), shader_color);
- 		else
- 			glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB, (GLsizei)strlen(shader_basic), shader_basic);
+ 	smoke_program = GPU_shader_get_builtin_program(progtype);
+ 	if (smoke_program) {
+ 		GPU_program_bind(smoke_program);
  
  		/* cell spacing */
- 		glProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, 0, dx, dx, dx, 1.0);
+ 		GPU_program_parameter_4f(smoke_program, 0, dx, dx, dx, 1.0);
  		/* custom parameter for smoke style (higher = thicker) */
  		if (sds->active_fields & SM_ACTIVE_COLORS)
- 			glProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, 1, 1.0, 1.0, 1.0, 10.0 * thickness);
 -			GPU_program_parameter_4f(smoke_program, 1, 1.0, 1.0, 1.0, 10.0);
++			GPU_program_parameter_4f(smoke_program, 1, 1.0, 1.0, 1.0, 10.0 * thickness);
  		else
- 			glProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, 1, sds->active_color[0], sds->active_color[1], sds->active_color[2], 10.0 * thickness);
 -			GPU_program_parameter_4f(smoke_program, 1, sds->active_color[0], sds->active_color[1], sds->active_color[2], 10.0);
++			GPU_program_parameter_4f(smoke_program, 1, sds->active_color[0], sds->active_color[1], sds->active_color[2], 10.0 * thickness);
  	}
  	else
  		printf("Your gfx card does not support 3D View smoke drawing.\n");




More information about the Bf-blender-cvs mailing list