Hi Thomas, 12/11/04, Thomas Dinges wrote: > Hi, > both branches are fine, and contain the same.
It seems that RB-1.2 is based on origin/RB-1.2, while blender-fixes is based on origin/master... I knew both of them can work, but I'm not sure which is better. Which branch will be used for lib/? BTW, I think find_library(OSL... ) in CMakeLists.txt should be removed because it finds unusable system-wide OSL under /usr rather than CYCLES_OSL and causes build failure. -- IRIE Shinsuke _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers
