[Bf-blender-cvs] [c968736] opensubdiv-modifier: Merge branch 'master' into opensubdiv-modifier

Sergey Sharybin noreply at git.blender.org
Wed Aug 6 11:17:25 CEST 2014


Commit: c9687366da37fef4967761a07112aa4a4b18396e
Author: Sergey Sharybin
Date:   Wed Aug 6 15:13:37 2014 +0600
Branches: opensubdiv-modifier
https://developer.blender.org/rBc9687366da37fef4967761a07112aa4a4b18396e

Merge branch 'master' into opensubdiv-modifier

Conflicts:
	build_files/cmake/macros.cmake
	extern/CMakeLists.txt
	extern/SConscript
	extern/clew/include/clew.h
	extern/cuew/auto/cuew_gen.py
	extern/cuew/src/cuew.c
	source/blender/compositor/intern/COM_WorkScheduler.cpp

===================================================================



===================================================================

diff --cc extern/CMakeLists.txt
index d882d15,8d85551..0760072
--- a/extern/CMakeLists.txt
+++ b/extern/CMakeLists.txt
@@@ -70,9 -70,9 +70,9 @@@ if(WITH_LZMA
  	add_subdirectory(lzma)
  endif()
  
 -if(WITH_CYCLES OR WITH_COMPOSITOR)
 +if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV)
-     add_subdirectory(clew)
-     add_subdirectory(cuew)
+ 	add_subdirectory(clew)
+ 	add_subdirectory(cuew)
  endif()
  
  if(WITH_MOD_BOOLEAN)
diff --cc extern/SConscript
index daa1315,714dfd2..3a3f128
--- a/extern/SConscript
+++ b/extern/SConscript
@@@ -20,7 -20,7 +20,7 @@@ if env['WITH_BF_ELTOPO']
  if env['WITH_BF_BULLET']:
      SConscript(['bullet2/src/SConscript'])
  
- if env['WITH_BF_COMPOSITOR'] or env['WITH_BF_OPENSUBDIV']:
 -if env['WITH_BF_COMPOSITOR'] or env['WITH_BF_CYCLES']:
++if env['WITH_BF_COMPOSITOR'] or env['WITH_BF_CYCLES'] or env['WITH_BF_OPENSUBDIV']:
      SConscript (['clew/SConscript'])
      SConscript (['cuew/SConscript'])
  
diff --cc extern/cuew/auto/cuda_extra.py
index fd4f466,fd4f466..5fd2c17
--- a/extern/cuew/auto/cuda_extra.py
+++ b/extern/cuew/auto/cuda_extra.py
@@@ -101,7 -101,7 +101,7 @@@ int cuewCompilerVersion(void) 
  
    while (!feof(pipe)) {
      if (fgets(buf, sizeof(buf), pipe) != NULL) {
--      strncat(output, buf, sizeof(output) - strlen(output));
++      strncat(output, buf, sizeof(output) - strlen(output) - 1);
      }
    }




More information about the Bf-blender-cvs mailing list