Thanks for the explanation. I will use RB-1.2, too. -- IRIE Shinsuke
12/11/04, Thomas Dinges wrote: > Hi IRIE, > it should really not matter, we will probably use our own RB-1.2. It depends > on how fast our pull request will get accepted (we still have to do that > one). Then we can use origin/master too. > > Thanks for the tip with find_library, will check with Lukas and Jens. > > Regards, > Thomas > > Am 04.11.2012 05:52, schrieb IRIE Shinsuke: >> 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. >> > > _______________________________________________ Bf-committers mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-committers
