sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles OSL: handle new getattribute constant folding with renderstate NULL check,

Browse Source 
and fix #33654, distance to line segment function is not implemented but compiled
anyway, now it should give a compile error.
This commit is contained in:
Brecht Van Lommel 2012-12-22 15:15:11 +00:00
parent 541f598466
commit 80d22a3f12
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
intern/cycles/kernel/osl/osl_services.cpp
View File

@ -634,11 +634,10 @@ bool OSLRenderServices::get_attribute(void *renderstate, bool derivatives, ustri
{ {
KernelGlobals *kg = kernel_globals; KernelGlobals *kg = kernel_globals;
ShaderData *sd = (ShaderData *)renderstate; ShaderData *sd = (ShaderData *)renderstate;
int object = sd->object; int object, tri;
int tri = sd->prim;
/* lookup of attribute on another object */ /* lookup of attribute on another object */
if (object_name != u_empty) { if (object_name != u_empty || sd == NULL) {
OSLGlobals::ObjectNameMap::iterator it = kg->osl->object_name_map.find(object_name); OSLGlobals::ObjectNameMap::iterator it = kg->osl->object_name_map.find(object_name);
if (it == kg->osl->object_name_map.end()) if (it == kg->osl->object_name_map.end())
@ -647,8 +646,12 @@ bool OSLRenderServices::get_attribute(void *renderstate, bool derivatives, ustri
object = it->second; object = it->second;
tri = ~0; tri = ~0;
} }
else if (object == ~0) { else {
return get_background_attribute(kg, sd, name, type, derivatives, val); object = sd->object;
tri = sd->prim;
if (object == ~0)
return get_background_attribute(kg, sd, name, type, derivatives, val);
} }
/* find attribute on object */ /* find attribute on object */

1
intern/cycles/kernel/shaders/stdosl.h
View File

@ -161,7 +161,6 @@ vector cross (vector a, vector b) BUILTIN;
float dot (vector a, vector b) BUILTIN; float dot (vector a, vector b) BUILTIN;
float length (vector v) BUILTIN; float length (vector v) BUILTIN;
float distance (point a, point b) BUILTIN; float distance (point a, point b) BUILTIN;
float distance (point a, point b, point q) BUILTIN;
normal normalize (normal v) BUILTIN; normal normalize (normal v) BUILTIN;
vector normalize (vector v) BUILTIN; vector normalize (vector v) BUILTIN;
vector faceforward (vector N, vector I, vector Nref) BUILTIN; vector faceforward (vector N, vector I, vector Nref) BUILTIN;