[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42549] trunk/blender/source/blender/gpu/ intern/gpu_draw.c: Compile fix for r.42546 typo
Joshua Leung
aligorith at gmail.com
Sat Dec 10 04:24:33 CET 2011
Revision: 42549
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42549
Author: aligorith
Date: 2011-12-10 03:24:19 +0000 (Sat, 10 Dec 2011)
Log Message:
-----------
Compile fix for r.42546 typo
Modified Paths:
--------------
trunk/blender/source/blender/gpu/intern/gpu_draw.c
Modified: trunk/blender/source/blender/gpu/intern/gpu_draw.c
===================================================================
--- trunk/blender/source/blender/gpu/intern/gpu_draw.c 2011-12-10 01:20:09 UTC (rev 42548)
+++ trunk/blender/source/blender/gpu/intern/gpu_draw.c 2011-12-10 03:24:19 UTC (rev 42549)
@@ -1162,7 +1162,7 @@
GPU_material_vertex_attributes(gpumat, gattribs);
GPU_material_bind(gpumat, GMS.gob->lay, GMS.glay, 1.0, !(GMS.gob->mode & OB_MODE_TEXTURE_PAINT));
- auto_bump_scale = GMS.gob->derivedFinal != NULL GMS.gob->derivedFinal->auto_bump_scale : 1.0f;
+ auto_bump_scale = GMS.gob->derivedFinal != NULL ? GMS.gob->derivedFinal->auto_bump_scale : 1.0f;
GPU_material_bind_uniforms(gpumat, GMS.gob->obmat, GMS.gviewmat, GMS.gviewinv, GMS.gob->col, auto_bump_scale);
GMS.gboundmat= mat;
More information about the Bf-blender-cvs
mailing list