[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51475] trunk/blender/intern/cycles/kernel /osl/osl_closures.h: Fix for OSL closure base class.

Lukas Toenne lukas.toenne at googlemail.com
Sun Oct 21 11:10:51 CEST 2012


Revision: 51475
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51475
Author:   lukastoenne
Date:     2012-10-21 09:10:47 +0000 (Sun, 21 Oct 2012)
Log Message:
-----------
Fix for OSL closure base class. The 'blur' method is not implemented and must be declared pure virtual ('= 0') to avoid compiler error (on Ubuntu 12.04, gcc 4.6.3).

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/osl/osl_closures.h

Modified: trunk/blender/intern/cycles/kernel/osl/osl_closures.h
===================================================================
--- trunk/blender/intern/cycles/kernel/osl/osl_closures.h	2012-10-21 08:13:34 UTC (rev 51474)
+++ trunk/blender/intern/cycles/kernel/osl/osl_closures.h	2012-10-21 09:10:47 UTC (rev 51475)
@@ -77,7 +77,7 @@
     int shaderdata_flag() const { return m_shaderdata_flag; }
 	ClosureType shaderclosure_type() const { return sc.type; }
 
-    virtual void blur(float roughness);
+    virtual void blur(float roughness) = 0;
     virtual float3 eval_reflect(const float3 &omega_out, const float3 &omega_in, float &pdf) const = 0;
     virtual float3 eval_transmit(const float3 &omega_out, const float3 &omega_in, float &pdf) const = 0;
 




More information about the Bf-blender-cvs mailing list