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

Sergey Sharybin noreply at git.blender.org
Mon Jul 20 14:31:34 CEST 2015


Commit: 0b64117365655fc553953e767ba187cb12c31a58
Author: Sergey Sharybin
Date:   Mon Jul 20 14:24:49 2015 +0200
Branches: opensubdiv-modifier
https://developer.blender.org/rB0b64117365655fc553953e767ba187cb12c31a58

Merge branch 'master' into opensubdiv-modifier

Conflicts:
	CMakeLists.txt
	source/blender/blenkernel/intern/subsurf_ccg.c

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



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

diff --cc CMakeLists.txt
index 39a94c7,88cf5b7..7adbc02
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -221,9 -221,12 +221,14 @@@ mark_as_advanced(WITH_SYSTEM_BULLET
  option(WITH_GAMEENGINE    "Enable Game Engine" ${_init_GAMEENGINE})
  option(WITH_PLAYER        "Build Player" OFF)
  option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ${_init_OPENCOLORIO})
- option(WITH_COMPOSITOR    "Enable the tile based nodal compositor" ON)
+ 
+ # Compositor
+ option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
+ option(WITH_COMPOSITOR_WERROR  "Treat warnings as errors in compositor code" OFF)
+ mark_as_advanced(WITH_COMPOSITOR_WERROR)
+ 
 +option(WITH_OPENSUBDIV    "Enable OpenSubdiv for surface subdivision" ON)
 +
  # GHOST Windowing Library Options
  option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
  mark_as_advanced(WITH_GHOST_DEBUG)
diff --cc source/blender/blenkernel/intern/subsurf_ccg.c
index b08d201,d419fc7..7d21b33
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@@ -77,10 -77,9 +77,13 @@@
  
  #include "CCGSubSurf.h"
  
 +#ifdef WITH_OPENSUBDIV
 +#  include "opensubdiv_capi.h"
 +#endif
 +
+ /* assumes MLoop's are layed out 4 for each poly, in order */
+ #define USE_LOOP_LAYOUT_FAST
+ 
  extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
  
  static ThreadRWMutex loops_cache_rwlock = BLI_RWLOCK_INITIALIZER;




More information about the Bf-blender-cvs mailing list