[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41901] branches/bmesh/blender: svn merge -r41847:41899 ^/trunk/blender
Campbell Barton
ideasman42 at gmail.com
Wed Nov 16 04:10:22 CET 2011
Revision: 41901
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41901
Author: campbellbarton
Date: 2011-11-16 03:10:15 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
svn merge -r41847:41899 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41847
Modified Paths:
--------------
branches/bmesh/blender/build_files/scons/config/linux-config.py
branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
branches/bmesh/blender/extern/libmv/third_party/glog/src/config_linux.h
branches/bmesh/blender/intern/cycles/CMakeLists.txt
branches/bmesh/blender/intern/cycles/SConscript
branches/bmesh/blender/intern/cycles/blender/addon/__init__.py
branches/bmesh/blender/intern/cycles/blender/addon/engine.py
branches/bmesh/blender/intern/cycles/blender/addon/enums.py
branches/bmesh/blender/intern/cycles/blender/addon/presets.py
branches/bmesh/blender/intern/cycles/blender/addon/properties.py
branches/bmesh/blender/intern/cycles/blender/addon/ui.py
branches/bmesh/blender/intern/cycles/blender/addon/xml.py
branches/bmesh/blender/intern/cycles/device/device_cpu.cpp
branches/bmesh/blender/intern/cycles/kernel/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/kernel.h
branches/bmesh/blender/intern/cycles/kernel/kernel_shader.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_oren_nayar.h
branches/bmesh/blender/intern/cycles/util/CMakeLists.txt
branches/bmesh/blender/intern/cycles/util/util_opencl.h
branches/bmesh/blender/intern/cycles/util/util_system.cpp
branches/bmesh/blender/intern/cycles/util/util_system.h
branches/bmesh/blender/intern/itasc/kdl/chain.hpp
branches/bmesh/blender/intern/itasc/kdl/tree.hpp
branches/bmesh/blender/release/bin/blender-softwaregl
branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/source/blender/blenkernel/BKE_idprop.h
branches/bmesh/blender/source/blender/blenkernel/BKE_screen.h
branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
branches/bmesh/blender/source/blender/blenkernel/intern/idprop.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c
branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
branches/bmesh/blender/source/blender/editors/curve/editcurve.c
branches/bmesh/blender/source/blender/editors/include/ED_curve.h
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/object/object_add.c
branches/bmesh/blender/source/blender/editors/object/object_ops.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_buttons.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_select.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_tools.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
branches/bmesh/blender/source/blender/editors/transform/transform_manipulator.c
branches/bmesh/blender/source/blender/editors/transform/transform_snap.c
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/bmesh/blender/source/blender/imbuf/intern/anim_movie.c
branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_particle_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_tracking_types.h
branches/bmesh/blender/source/blender/makesrna/RNA_define.h
branches/bmesh/blender/source/blender/makesrna/RNA_types.h
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_armature.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_mesh.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_movieclip.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_pose.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_text.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_text_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_tracking.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_ui_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_wm.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_ocean.c
branches/bmesh/blender/source/blender/python/generic/CMakeLists.txt
branches/bmesh/blender/source/blender/python/intern/bpy.c
branches/bmesh/blender/source/blender/python/intern/bpy_props.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_apple.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
branches/bmesh/blender/source/creator/creator.c
Added Paths:
-----------
branches/bmesh/blender/intern/cycles/kernel/kernel_optimized.cpp
branches/bmesh/blender/intern/cycles/util/util_opencl.cpp
branches/bmesh/blender/release/scripts/presets/camera/Sony_A55.py
branches/bmesh/blender/release/scripts/presets/tracking_camera/Sony_A55.py
branches/bmesh/blender/source/blender/python/generic/idprop_py_api.c
branches/bmesh/blender/source/blender/python/generic/idprop_py_api.h
Removed Paths:
-------------
branches/bmesh/blender/intern/cycles/util/util_opencl.c
branches/bmesh/blender/source/blender/python/generic/IDProp.c
branches/bmesh/blender/source/blender/python/generic/IDProp.h
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/extern/libmv/third_party/ssba/README.libmv
branches/bmesh/blender/intern/cycles/util/util_opencl.h
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41847
+ /trunk/blender:39992-41899
Modified: branches/bmesh/blender/build_files/scons/config/linux-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/linux-config.py 2011-11-16 02:14:39 UTC (rev 41900)
+++ branches/bmesh/blender/build_files/scons/config/linux-config.py 2011-11-16 03:10:15 UTC (rev 41901)
@@ -197,7 +197,8 @@
BF_JEMALLOC_LIB = 'jemalloc'
BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
-WITH_BF_OIIO = True
+WITH_BF_OIIO = True
+WITH_BF_STATICOIIO = False
BF_OIIO = LIBDIR + '/oiio'
if not os.path.exists(LCGDIR + '/oiio'):
WITH_BF_OIIO = False
@@ -207,6 +208,7 @@
BF_OIIO_LIBPATH = BF_OIIO + '/lib'
WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = False
BF_BOOST = LIBDIR + '/boost'
if not os.path.exists(LCGDIR + '/boost'):
WITH_BF_BOOST = False
@@ -225,6 +227,7 @@
#SpaceNavigator and friends
WITH_BF_3DMOUSE = True
+WITH_BF_STATIC3DMOUSE = False
BF_3DMOUSE = '/usr'
BF_3DMOUSE_INC = '${BF_3DMOUSE}/include'
BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
Modified: branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-11-16 02:14:39 UTC (rev 41900)
+++ branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py 2011-11-16 03:10:15 UTC (rev 41901)
@@ -589,6 +589,7 @@
"active_base": ("ObjectBase", False),
"active_bone": ("Bone", False),
"active_object": ("Object", False),
+ "active_operator": ("Operator", False),
"active_pose_bone": ("PoseBone", False),
"armature": ("Armature", False),
"bone": ("Bone", False),
@@ -597,6 +598,7 @@
"cloth": ("ClothModifier", False),
"collision": ("CollisionModifier", False),
"curve": ("Curve", False),
+ "dynamic_paint": ("DynamicPaintModifier", False),
"edit_bone": ("EditBone", False),
"edit_image": ("Image", False),
"edit_object": ("Object", False),
@@ -635,6 +637,7 @@
"speaker": ("Speaker", False),
"texture": ("Texture", False),
"texture_slot": ("MaterialTextureSlot", False),
+ "texture_user": ("ID", False),
"vertex_paint_object": ("Object", False),
"visible_bases": ("ObjectBase", True),
"visible_bones": ("Object", True),
Modified: branches/bmesh/blender/extern/libmv/third_party/glog/src/config_linux.h
===================================================================
--- branches/bmesh/blender/extern/libmv/third_party/glog/src/config_linux.h 2011-11-16 02:14:39 UTC (rev 41900)
+++ branches/bmesh/blender/extern/libmv/third_party/glog/src/config_linux.h 2011-11-16 03:10:15 UTC (rev 41901)
@@ -131,7 +131,7 @@
#define PACKAGE_VERSION "0.3.1"
/* How to access the PC from a struct ucontext */
-#if defined(_M_X64) || defined(__amd64__)
+#if defined(_M_X64) || defined(__amd64__) || defined(__x86_64__)
#define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_RIP]
#else
#define PC_FROM_UCONTEXT uc_mcontext.gregs[REG_EIP]
Property changes on: branches/bmesh/blender/extern/libmv/third_party/ssba/README.libmv
___________________________________________________________________
Deleted: svn:executable
- *
Modified: branches/bmesh/blender/intern/cycles/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/cycles/CMakeLists.txt 2011-11-16 02:14:39 UTC (rev 41900)
+++ branches/bmesh/blender/intern/cycles/CMakeLists.txt 2011-11-16 03:10:15 UTC (rev 41901)
@@ -9,32 +9,19 @@
# Build Flags
if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
- set(GCC_OPTIM_FLAGS "-ffast-math -msse -msse2 -msse3")
-endif()
+ set(WITH_CYCLES_OPTIMIZED_KERNEL ON)
-if(APPLE)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_OPTIM_FLAGS}")
- set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
-endif()
-
-if(WIN32)
- if(MSVC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast")
- set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+ if(WIN32 AND MSVC)
+ set(CYCLES_OPTIMIZED_KERNEL_FLAGS "/Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast")
elseif(CMAKE_COMPILER_IS_GNUCC)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_OPTIM_FLAGS}")
- set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+ set(CYCLES_OPTIMIZED_KERNEL_FLAGS "-ffast-math -msse -msse2 -msse3 -DGOGOGO")
endif()
endif()
-if(UNIX AND NOT APPLE)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_OPTIM_FLAGS}")
- set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
-endif()
+# for OSL, not needed yet
+# set(RTTI_DISABLE_FLAGS "-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
+# set(RTTI_DISABLE_FLAGS "/GR- -DBOOST_NO_RTTI -DBOOST_NO_TYPEID")
-# not needed yet, is for open shading language
-set(RTTI_DISABLE_FLAGS "")
-
# Definitions and Includes
add_definitions(${BOOST_DEFINITIONS} ${OPENIMAGEIO_DEFINITIONS})
@@ -42,6 +29,10 @@
add_definitions(-DCCL_NAMESPACE_BEGIN=namespace\ ccl\ {)
add_definitions(-DCCL_NAMESPACE_END=})
+if(WITH_CYCLES_OPTIMIZED_KERNEL)
+ add_definitions(-DWITH_OPTIMIZED_KERNEL)
+endif()
+
if(WITH_CYCLES_NETWORK)
add_definitions(-DWITH_NETWORK)
endif()
Modified: branches/bmesh/blender/intern/cycles/SConscript
===================================================================
--- branches/bmesh/blender/intern/cycles/SConscript 2011-11-16 02:14:39 UTC (rev 41900)
+++ branches/bmesh/blender/intern/cycles/SConscript 2011-11-16 03:10:15 UTC (rev 41901)
@@ -6,15 +6,14 @@
cycles.Depends('../../source/blender/makesrna/intern/RNA_blender_cpp.h', 'makesrna')
-sources = cycles.Glob('bvh/*.cpp') + cycles.Glob('device/*.cpp') + cycles.Glob('kernel/*.cpp') + cycles.Glob('render/*.cpp') + cycles.Glob('subd/*.cpp') + cycles.Glob('util/*.cpp') + cycles.Glob('util/*.c') + cycles.Glob('blender/*.cpp')
+sources = cycles.Glob('bvh/*.cpp') + cycles.Glob('device/*.cpp') + cycles.Glob('kernel/*.cpp') + cycles.Glob('render/*.cpp') + cycles.Glob('subd/*.cpp') + cycles.Glob('util/*.cpp') + cycles.Glob('blender/*.cpp')
sources.remove(path.join('util', 'util_view.cpp'))
sources.remove(path.join('render', 'film_response.cpp'))
+sources.remove(path.join('kernel', 'kernel_optimized.cpp'))
incs = []
defs = []
-ccflags = []
-cxxflags = []
defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
defs.append('CCL_NAMESPACE_END=}')
@@ -23,14 +22,6 @@
defs.append('WITH_MULTI')
defs.append('WITH_CUDA')
-if env['OURPLATFORM'] in ('win32-mingw'):
- if env['WITH_BF_RAYOPTIMIZATION']:
- cxxflags.append('-ffast-math -msse -msse2 -msse3'.split())
- ccflags.append('-ffast-math -msse -msse2 -msse3'.split())
- # not needed yet, is for open shading language
- # cxxflags.append('-fno-rtti'.split())
- # defs.append('BOOST_NO_RTTI BOOST_NO_TYPEID'.split())
-
incs.extend('. bvh render device kernel kernel/osl kernel/svm util subd'.split())
incs.extend('#intern/guardedalloc #source/blender/makesrna #source/blender/makesdna'.split())
incs.extend('#source/blender/blenloader ../../source/blender/makesrna/intern'.split())
@@ -39,5 +30,20 @@
incs.append(cycles['BF_BOOST_INC'])
incs.append(cycles['BF_PYTHON_INC'])
-cycles.BlenderLib('bf_intern_cycles', sources, incs, defs, libtype=['intern'], priority=[0], compileflags=[None], cc_compileflags=ccflags, cxx_compileflags=cxxflags)
+# optimized kernel
+if env['WITH_BF_RAYOPTIMIZATION']:
+ optim_cxxflags = []
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+ optim_cxxflags.append('/Ox /Ot /arch:SSE2 -D_CRT_SECURE_NO_WARNINGS /EHsc /fp:fast'.split())
+ else:
+ optim_cxxflags.append('-ffast-math -msse -msse2 -msse3'.split())
+
+ optim_defs = defs + ['WITH_OPTIMIZED_KERNEL']
+ optim_sources = [path.join('kernel', 'kernel_optimized.cpp')]
+
+ cycles_optim = cycles.Clone()
+ cycles_optim.BlenderLib('bf_intern_cycles_optimized', optim_sources, incs, optim_defs, libtype=['intern'], priority=[0], compileflags=[None], cxx_compileflags=optim_cxxflags)
+
+cycles.BlenderLib('bf_intern_cycles', sources, incs, defs, libtype=['intern'], priority=[0], compileflags=[None])
+
Modified: branches/bmesh/blender/intern/cycles/blender/addon/__init__.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/__init__.py 2011-11-16 02:14:39 UTC (rev 41900)
+++ branches/bmesh/blender/intern/cycles/blender/addon/__init__.py 2011-11-16 03:10:15 UTC (rev 41901)
@@ -16,10 +16,12 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
+# <pep8 compliant>
+
bl_info = {
"name": "Cycles Render Engine",
"author": "",
- "version": (0,0),
+ "version": (0, 0),
"blender": (2, 6, 0),
"api": 41670,
"location": "Info header, render engine menu",
@@ -38,6 +40,7 @@
from cycles import engine
from cycles import presets
+
class CyclesRender(bpy.types.RenderEngine):
bl_idname = 'CYCLES'
bl_label = "Cycles"
@@ -46,7 +49,7 @@
def __init__(self):
engine.init()
self.session = None
-
+
def __del__(self):
engine.free(self)
@@ -64,7 +67,7 @@
#
# def preview_render(self):
# pass
-
+
# viewport render
def view_update(self, context):
if not self.session:
@@ -75,6 +78,7 @@
def view_draw(self, context):
engine.draw(self, context.region, context.space_data, context.region_data)
+
def register():
properties.register()
ui.register()
@@ -82,10 +86,10 @@
presets.register()
bpy.utils.register_module(__name__)
+
def unregister():
xml.unregister()
ui.unregister()
properties.unregister()
presets.unregister()
bpy.utils.unregister_module(__name__)
-
Modified: branches/bmesh/blender/intern/cycles/blender/addon/engine.py
===================================================================
--- branches/bmesh/blender/intern/cycles/blender/addon/engine.py 2011-11-16 02:14:39 UTC (rev 41900)
+++ branches/bmesh/blender/intern/cycles/blender/addon/engine.py 2011-11-16 03:10:15 UTC (rev 41901)
@@ -16,8 +16,11 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list