Merge branch 'blender2.8' into soc-2018-bevel

CMakeLists.txt

@@ -439,7 +439,7 @@ mark_as_advanced(WITH_MEM_VALGRIND)
 option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
 mark_as_advanced(WITH_CXX_GUARDEDALLOC)
 
-option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
+option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" ON)
 mark_as_advanced(WITH_ASSERT_ABORT)
 
 option(WITH_BOOST					"Enable features depending on boost" ON)
@@ -806,7 +806,8 @@ set(C_WARNINGS)
 set(CXX_WARNINGS)
 
 # for gcc -Wno-blah-blah
-set(CC_REMOVE_STRICT_FLAGS)
+set(C_REMOVE_STRICT_FLAGS)
+set(CXX_REMOVE_STRICT_FLAGS)
 
 # libraries to link the binary with passed to target_link_libraries()
 # known as LLIBS to scons
@@ -1415,16 +1416,22 @@ if(CMAKE_COMPILER_IS_GNUCC)
 	endif()
 
 	# flags to undo strict flags
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION         -Wno-unused-function)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION         -Wno-unused-function)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_TYPE_LIMITS             -Wno-type-limits)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_INT_IN_BOOL_CONTEXT     -Wno-int-in-bool-context)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_FORMAT                  -Wno-format)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_SWITCH                  -Wno-switch)
+
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_CLASS_MEMACCESS     -Wno-class-memaccess)
 
 	if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "7.0"))
-		ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_IMPLICIT_FALLTHROUGH    -Wno-implicit-fallthrough)
+		ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_IMPLICIT_FALLTHROUGH    -Wno-implicit-fallthrough)
 	endif()
 
 	if(NOT APPLE)
-		ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
+		ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
 	endif()
 
 elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
@@ -1453,23 +1460,23 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
 	# ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_MACROS          -Wunused-macros)
 
 	# flags to undo strict flags
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS    -Wno-unused-macros)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS    -Wno-unused-macros)
 
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INCOMPAT_PTR_DISCARD_QUAL -Wno-incompatible-pointer-types-discards-qualifiers)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_INCOMPAT_PTR_DISCARD_QUAL -Wno-incompatible-pointer-types-discards-qualifiers)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef)
-	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)
+	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)
 
-	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
-	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing)
-	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor)
-	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
-	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder)
+	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder)
 
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 

build_files/build_environment/cmake/llvm.cmake

@@ -58,4 +58,3 @@ if(MSVC)
 		DEPENDEES mkdir update patch download configure build install
 	)
 endif()
-

build_files/build_environment/cmake/setup_mingw32.cmake

@@ -216,4 +216,3 @@ if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe")
 		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe"
 	)
 endif()
-

build_files/build_environment/cmake/setup_mingw64.cmake

@@ -216,4 +216,3 @@ if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ranlib.exe")
 		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ranlib.exe"
 	)
 endif()
-

build_files/build_environment/cmake/zlib_mingw.cmake

@@ -37,4 +37,3 @@ endif()
 if(MSVC)
 	set_target_properties(external_zlib_mingw PROPERTIES FOLDER Mingw)
 endif()
-

build_files/build_environment/patches/cmake/modules/SelectLibraryConfigurations.cmake

@@ -79,4 +79,3 @@ macro( select_library_configurations basename )
         ${basename}_LIBRARY_DEBUG
     )
 endmacro( select_library_configurations )
-

build_files/cmake/Modules/FindLLVM.cmake

@@ -93,4 +93,3 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(LLVM DEFAULT_MSG
 MARK_AS_ADVANCED(
   LLVM_LIBRARY
 )
-

build_files/cmake/macros.cmake

@@ -674,7 +674,9 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		extern_openjpeg
 		ge_videotex
 		bf_dna
+
 		bf_blenfont
+		bf_gpu  # duplicate for blenfont
 		bf_blentranslation
 		bf_intern_audaspace
 		audaspace
@@ -1054,13 +1056,19 @@ macro(remove_cc_flag
 
 endmacro()
 
-macro(add_cc_flag
+macro(add_c_flag
 	flag)
 
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
 endmacro()
 
+macro(add_cxx_flag
+	flag)
+
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+endmacro()
+
 macro(remove_strict_flags)
 
 	if(CMAKE_COMPILER_IS_GNUCC)
@@ -1083,7 +1091,8 @@ macro(remove_strict_flags)
 		)
 
 		# negate flags implied by '-Wall'
-		add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
+		add_c_flag("${C_REMOVE_STRICT_FLAGS}")
+		add_cxx_flag("${CXX_REMOVE_STRICT_FLAGS}")
 	endif()
 
 	if(CMAKE_C_COMPILER_ID MATCHES "Clang")
@@ -1095,7 +1104,8 @@ macro(remove_strict_flags)
 		)
 
 		# negate flags implied by '-Wall'
-		add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
+		add_c_flag("${C_REMOVE_STRICT_FLAGS}")
+		add_cxx_flag("${CXX_REMOVE_STRICT_FLAGS}")
 	endif()
 
 	if(MSVC)
@@ -1125,28 +1135,39 @@ endmacro()
 # note, we can only append flags on a single file so we need to negate the options.
 # at the moment we cant shut up ffmpeg deprecations, so use this, but will
 # probably add more removals here.
-macro(remove_strict_flags_file
+macro(remove_strict_c_flags_file
 	filenames)
-
 	foreach(_SOURCE ${ARGV})
-
 		if(CMAKE_COMPILER_IS_GNUCC OR
 		   (CMAKE_C_COMPILER_ID MATCHES "Clang"))
-
 			set_source_files_properties(${_SOURCE}
 				PROPERTIES
-					COMPILE_FLAGS "${CC_REMOVE_STRICT_FLAGS}"
+					COMPILE_FLAGS "${C_REMOVE_STRICT_FLAGS}"
 			)
 		endif()
-
 		if(MSVC)
 			# TODO
 		endif()
-
 	endforeach()
-
 	unset(_SOURCE)
+endmacro()
 
+macro(remove_strict_cxx_flags_file
+	filenames)
+	remove_strict_c_flags_file(${filenames} ${ARHV})
+	foreach(_SOURCE ${ARGV})
+		if(CMAKE_COMPILER_IS_GNUCC OR
+		   (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+			set_source_files_properties(${_SOURCE}
+				PROPERTIES
+					COMPILE_FLAGS "${CXX_REMOVE_STRICT_FLAGS}"
+			)
+		endif()
+		if(MSVC)
+			# TODO
+		endif()
+	endforeach()
+	unset(_SOURCE)
 endmacro()
 
 # External libs may need 'signed char' to be default.

doc/python_api/examples/blf.py

@@ -15,6 +15,7 @@ font_info = {
     "handler": None,
 }
 
+
 def init():
     """init function - runs once"""
     import os

doc/python_api/examples/bpy.app.handlers.1.py

@@ -17,4 +17,5 @@ from bpy.app.handlers import persistent
 def load_handler(dummy):
     print("Load Handler:", bpy.data.filepath)
 
+
 bpy.app.handlers.load_post.append(load_handler)

doc/python_api/examples/bpy.app.handlers.py

@@ -11,4 +11,5 @@ import bpy
 def my_handler(scene):
     print("Frame Change", scene.frame_current)
 
+
 bpy.app.handlers.frame_change_pre.append(my_handler)

doc/python_api/examples/bpy.app.translations.py

@@ -81,6 +81,7 @@ for msg in translations_tuple:
 
 # Define remaining addon (operators, UI...) here.
 
+
 def register():
    # Usual operator/UI/etc. registration...
 

doc/python_api/examples/bpy.props.2.py

@@ -14,6 +14,7 @@ class MaterialSettings(bpy.types.PropertyGroup):
     my_float = bpy.props.FloatProperty()
     my_string = bpy.props.StringProperty()
 
+
 bpy.utils.register_class(MaterialSettings)
 
 bpy.types.Material.my_settings = \

doc/python_api/examples/bpy.props.3.py

@@ -14,6 +14,7 @@ class SceneSettingItem(bpy.types.PropertyGroup):
     name = bpy.props.StringProperty(name="Test Prop", default="Unknown")
     value = bpy.props.IntProperty(name="Test Prop", default=22)
 
+
 bpy.utils.register_class(SceneSettingItem)
 
 bpy.types.Scene.my_settings = \

doc/python_api/examples/bpy.props.4.py

@@ -14,6 +14,7 @@ import bpy
 def update_func(self, context):
     print("my test function", self)
 
+
 bpy.types.Scene.testprop = bpy.props.FloatProperty(update=update_func)
 
 bpy.context.scene.testprop = 11.0

doc/python_api/examples/bpy.props.5.py

@@ -19,6 +19,7 @@ def get_float(self):
 def set_float(self, value):
     self["testprop"] = value
 
+
 bpy.types.Scene.test_float = bpy.props.FloatProperty(get=get_float, set=set_float)
 
 
@@ -27,6 +28,7 @@ def get_date(self):
     import datetime
     return str(datetime.datetime.now())
 
+
 bpy.types.Scene.test_date = bpy.props.StringProperty(get=get_date)
 
 
@@ -40,6 +42,7 @@ def get_array(self):
 def set_array(self, values):
     self["somebool"] = values[0] and values[1]
 
+
 bpy.types.Scene.test_array = bpy.props.BoolVectorProperty(size=2, get=get_array, set=set_array)
 
 
@@ -50,7 +53,7 @@ test_items = [
     ("GREEN", "Green", "", 2),
     ("BLUE", "Blue", "", 3),
     ("YELLOW", "Yellow", "", 4),
-    ]
+]
 
 
 def get_enum(self):
@@ -61,6 +64,7 @@ def get_enum(self):
 def set_enum(self, value):
     print("setting value", value)
 
+
 bpy.types.Scene.test_enum = bpy.props.EnumProperty(items=test_items, get=get_enum, set=set_enum)
 
 

doc/python_api/examples/bpy.types.AddonPreferences.1.py

@@ -9,7 +9,7 @@ bl_info = {
     "wiki_url": "",
     "tracker_url": "",
     "category": "Object",
-    }
+}
 
 
 import bpy

doc/python_api/examples/bpy.types.Menu.2.py

@@ -14,4 +14,5 @@ import bpy
 def menu_draw(self, context):
     self.layout.operator("wm.save_homefile")
 
+
 bpy.types.INFO_MT_file.append(menu_draw)

doc/python_api/examples/bpy.types.Menu.3.py

@@ -61,7 +61,7 @@ def panel_func(self, context):
 classes = (
     OBJECT_MT_draw_presets,
     AddPresetObjectDraw,
-    )
+)
 
 
 def register():

doc/python_api/examples/bpy.types.Menu.4.py

@@ -60,6 +60,7 @@ def menu_func(self, context):
     layout.separator()
     layout.operator(WM_OT_button_context_test.bl_idname)
 
+
 classes = (
     WM_OT_button_context_test,
     WM_MT_button_context,
@@ -77,5 +78,6 @@ def unregister():
         bpy.utils.unregister_class(cls)
     bpy.types.WM_MT_button_context.remove(menu_func)
 
+
 if __name__ == "__main__":
     register()

doc/python_api/examples/bpy.types.NodeTree.py

@@ -21,4 +21,5 @@ class CyclesNodeTree(bpy.types.NodeTree):
     def poll(cls, context):
         return context.scene.render.engine == 'CYCLES'
 
+
 bpy.utils.register_class(CyclesNodeTree)

doc/python_api/examples/bpy.types.Operator.1.py

@@ -42,6 +42,7 @@ class SimpleMouseOperator(bpy.types.Operator):
         self.y = event.mouse_y
         return self.execute(context)
 
+
 bpy.utils.register_class(SimpleMouseOperator)
 
 # Test call to the newly defined operator.

doc/python_api/examples/bpy.types.Operator.2.py

@@ -42,6 +42,7 @@ def menu_func(self, context):
     self.layout.operator_context = 'INVOKE_DEFAULT'
     self.layout.operator(ExportSomeData.bl_idname, text="Text Export Operator")
 
+
 # Register and add to the file selector
 bpy.utils.register_class(ExportSomeData)
 bpy.types.INFO_MT_file_export.append(menu_func)

doc/python_api/examples/bpy.types.Operator.4.py

@@ -41,6 +41,7 @@ class CustomDrawOperator(bpy.types.Operator):
 
         col.prop(self, "my_string")
 
+
 bpy.utils.register_class(CustomDrawOperator)
 
 # test call

doc/python_api/examples/bpy.types.Operator.py

@@ -22,6 +22,7 @@ class HelloWorldOperator(bpy.types.Operator):
         print("Hello World")
         return {'FINISHED'}
 
+
 bpy.utils.register_class(HelloWorldOperator)
 
 # test call to the newly defined operator

doc/python_api/examples/bpy.types.PropertyGroup.py

@@ -31,6 +31,7 @@ class MyPropertyGroup(bpy.types.PropertyGroup):
     custom_1 = bpy.props.FloatProperty(name="My Float")
     custom_2 = bpy.props.IntProperty(name="My Int")
 
+
 bpy.utils.register_class(MyPropertyGroup)
 
 bpy.types.Object.my_prop_grp = bpy.props.PointerProperty(type=MyPropertyGroup)

doc/python_api/examples/bpy.types.WindowManager.popup_menu.py

@@ -10,4 +10,5 @@ import bpy
 def draw(self, context):
     self.layout.label("Hello World")
 
+
 bpy.context.window_manager.popup_menu(draw, title="Greeting", icon='INFO')

doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py

@@ -12,6 +12,7 @@ from bpy.props import PointerProperty
 class MyPropGroup(bpy.types.PropertyGroup):
     nested = bpy.props.FloatProperty(name="Nested", default=0.0)
 
+
 # register it so its available for all bones
 bpy.utils.register_class(MyPropGroup)
 bpy.types.Bone.my_prop = PointerProperty(type=MyPropGroup,

extern/rangetree/CMakeLists.txt

@@ -28,4 +28,3 @@ set(SRC
 )
 
 blender_add_lib(extern_rangetree "${SRC}" "${INC}" "")
-

intern/cycles/CMakeLists.txt

@@ -355,4 +355,3 @@ endif()
 if(NOT WITH_BLENDER AND WITH_CYCLES_STANDALONE)
 	delayed_do_install(${CMAKE_BINARY_DIR}/bin)
 endif()
-

intern/cycles/blender/CMakeLists.txt

@@ -63,4 +63,3 @@ endif()
 add_dependencies(bf_intern_cycles bf_rna)
 
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${ADDON_FILES}" ${CYCLES_INSTALL_PATH})
-

intern/cycles/blender/addon/ui.py

@@ -193,7 +193,7 @@ class CYCLES_RENDER_PT_sampling(CyclesButtonsPanel, Panel):
 
         row = layout.row(align=True)
         row.prop(cscene, "seed")
-        row.prop(cscene, "use_animated_seed", text="", icon="TIME")
+        row.prop(cscene, "use_animated_seed", text="", icon='TIME')
 
         layout.prop(cscene, "sampling_pattern", text="Pattern")
 
@@ -847,7 +847,7 @@ class CYCLES_CAMERA_PT_dof_aperture(CyclesButtonsPanel, Panel):
     def draw(self, context):
         layout = self.layout
         layout.use_property_split = True
-        flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False)
+        flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
 
         cam = context.camera
         ccam = cam.cycles
@@ -878,7 +878,7 @@ class CYCLES_CAMERA_PT_dof_viewport(CyclesButtonsPanel, Panel):
     def draw(self, context):
         layout = self.layout
         layout.use_property_split = True
-        flow = layout.grid_flow(row_major=True, num_columns=0, even_columns=True, even_rows=False, align=False)
+        flow = layout.grid_flow(row_major=True, columns=0, even_columns=True, even_rows=False, align=False)
 
         cam = context.camera
         dof_options = cam.gpu_dof
@@ -1126,31 +1126,30 @@ class CYCLES_LAMP_PT_lamp(CyclesButtonsPanel, Panel):
 
         layout.prop(lamp, "type", expand=True)
 
-        split = layout.split()
+        layout.use_property_split = True
-        col = split.column(align=True)
+
+        col = layout.column()
 
         if lamp.type in {'POINT', 'SUN', 'SPOT'}:
             col.prop(lamp, "shadow_soft_size", text="Size")
         elif lamp.type == 'AREA':
-            col.prop(lamp, "shape", text="")
+            col.prop(lamp, "shape", text="Shape")
             sub = col.column(align=True)
 
             if lamp.shape in {'SQUARE', 'DISK'}:
                 sub.prop(lamp, "size")
             elif lamp.shape in {'RECTANGLE', 'ELLIPSE'}:
                 sub.prop(lamp, "size", text="Size X")
-                sub.prop(lamp, "size_y", text="Size Y")
+                sub.prop(lamp, "size_y", text="Y")
 
         if not (lamp.type == 'AREA' and clamp.is_portal):
-            sub = col.column(align=True)
+            sub = col.column()
             if use_branched_path(context):
                 subsub = sub.row(align=True)
                 subsub.active = use_sample_all_lights(context)
                 subsub.prop(clamp, "samples")
             sub.prop(clamp, "max_bounces")
 
-        col = split.column()
-
         sub = col.column(align=True)
         sub.active = not (lamp.type == 'AREA' and clamp.is_portal)
         sub.prop(clamp, "cast_shadow")
@@ -1192,17 +1191,12 @@ class CYCLES_LAMP_PT_spot(CyclesButtonsPanel, Panel):
 
     def draw(self, context):
         layout = self.layout
-
         lamp = context.lamp
+        layout.use_property_split = True
 
-        split = layout.split()
+        col = layout.column()
-
+        col.prop(lamp, "spot_size", text="Size")
-        col = split.column()
+        col.prop(lamp, "spot_blend", text="Blend", slider=True)
-        sub = col.column()
-        sub.prop(lamp, "spot_size", text="Size")
-        sub.prop(lamp, "spot_blend", text="Blend", slider=True)
-
-        col = split.column()
         col.prop(lamp, "show_cone")
 
 
@@ -1545,6 +1539,7 @@ class CYCLES_RENDER_PT_bake(CyclesButtonsPanel, Panel):
     def draw(self, context):
         layout = self.layout
         layout.use_property_split = True
+        layout.use_property_decorate = False  # No animation.
 
         scene = context.scene
         cscene = scene.cycles
@@ -1573,7 +1568,7 @@ class CYCLES_RENDER_PT_bake(CyclesButtonsPanel, Panel):
             if cscene.bake_type == 'NORMAL':
                 col.prop(cbk, "normal_space", text="Space")
 
-                sub = col.row(align=True)
+                sub = col.column(align=True)
                 sub.prop(cbk, "normal_r", text="Swizzle R")
                 sub.prop(cbk, "normal_g", text="G")
                 sub.prop(cbk, "normal_b", text="B")
@@ -1595,6 +1590,7 @@ class CYCLES_RENDER_PT_bake(CyclesButtonsPanel, Panel):
 
             elif cscene.bake_type in {'DIFFUSE', 'GLOSSY', 'TRANSMISSION', 'SUBSURFACE'}:
                 row = col.row(align=True)
+                row.use_property_split = False
                 row.prop(cbk, "use_pass_direct", toggle=True)
                 row.prop(cbk, "use_pass_indirect", toggle=True)
                 row.prop(cbk, "use_pass_color", toggle=True)
@@ -1613,10 +1609,12 @@ class CYCLES_RENDER_PT_bake(CyclesButtonsPanel, Panel):
             sub.prop(cbk, "use_cage", text="Cage")
             if cbk.use_cage:
                 sub.prop(cbk, "cage_extrusion", text="Extrusion")
-                sub.prop_search(cbk, "cage_object", scene, "objects", text="")
+                sub.prop_search(cbk, "cage_object", scene, "objects", text="Cage Object")
             else:
                 sub.prop(cbk, "cage_extrusion", text="Ray Distance")
 
+            layout.separator()
+
             layout.operator("object.bake", icon='RENDER_STILL').type = cscene.bake_type
 
 
@@ -1783,7 +1781,7 @@ def draw_pause(self, context):
 
         if view.shading.type == 'RENDERED':
             cscene = scene.cycles
-            layout.prop(cscene, "preview_pause", icon="PAUSE", text="")
+            layout.prop(cscene, "preview_pause", icon='PAUSE', text="")
 
 
 def get_panels():

intern/cycles/blender/addon/version_update.py

@@ -481,7 +481,7 @@ def do_versions(self):
             cworld = world.cycles
             # World MIS
             if not cworld.is_property_set("sampling_method"):
-                if cworld.get("sample_as_light", False):
+                if cworld.get("sample_as_light", True):
                     cworld.sampling_method = 'MANUAL'
                 else:
                     cworld.sampling_method = 'NONE'

intern/cycles/blender/blender_camera.cpp

@@ -457,6 +457,7 @@ static void blender_camera_sync(Camera *cam,
 	cam->matrix = blender_camera_matrix(bcam->matrix,
 	                                    bcam->type,
 	                                    bcam->panorama_type);
+	cam->motion.clear();
 	cam->motion.resize(bcam->motion_steps, cam->matrix);
 	cam->use_perspective_motion = false;
 	cam->shuttertime = bcam->shuttertime;

intern/cycles/blender/blender_object.cpp

@@ -448,6 +448,7 @@ Object *BlenderSync::sync_object(BL::Depsgraph& b_depsgraph,
 				mesh->motion_steps = motion_steps;
 			}
 
+			object->motion.clear();
 			object->motion.resize(motion_steps, transform_empty());
 
 			if(motion_steps) {

intern/cycles/blender/blender_session.cpp

@@ -54,6 +54,7 @@ BlenderSession::BlenderSession(BL::RenderEngine& b_engine,
                                BL::BlendData& b_data,
                                bool preview_osl)
 : session(NULL),
+  sync(NULL),
   b_engine(b_engine),
   b_userpref(b_userpref),
   b_data(b_data),
@@ -81,6 +82,7 @@ BlenderSession::BlenderSession(BL::RenderEngine& b_engine,
                                BL::RegionView3D& b_rv3d,
                                int width, int height)
 : session(NULL),
+  sync(NULL),
   b_engine(b_engine),
   b_userpref(b_userpref),
   b_data(b_data),
@@ -209,11 +211,8 @@ void BlenderSession::reset_session(BL::BlendData& b_data, BL::Depsgraph& b_depsg
 		/* if scene or session parameters changed, it's easier to simply re-create
 		 * them rather than trying to distinguish which settings need to be updated
 		 */
-
+		free_session();
-		delete session;
-
 		create_session();
-
 		return;
 	}
 

intern/cycles/blender/blender_util.h

@@ -293,7 +293,7 @@ static inline int4 get_int4(const BL::Array<int, 4>& array)
 	return make_int4(array[0], array[1], array[2], array[3]);
 }
 
-static inline uint get_layer(const BL::Array<int, 20>& array)
+static inline uint get_layer(const BL::Array<bool, 20>& array)
 {
 	uint layer = 0;
 
@@ -304,8 +304,8 @@ static inline uint get_layer(const BL::Array<int, 20>& array)
 	return layer;
 }
 
-static inline uint get_layer(const BL::Array<int, 20>& array,
+static inline uint get_layer(const BL::Array<bool, 20>& array,
-                             const BL::Array<int, 8>& local_array,
+                             const BL::Array<bool, 8>& local_array,
                              bool is_light = false,
                              uint view_layers = (1 << 20) - 1)
 {

intern/cycles/device/device_cuda.cpp

@@ -385,7 +385,7 @@ public:
 		VLOG(1) << "Found nvcc " << nvcc
 		        << ", CUDA version " << cuda_version
 		        << ".";
-		const int major = cuda_version / 10, minor = cuda_version & 10;
+		const int major = cuda_version / 10, minor = cuda_version % 10;
 		if(cuda_version == 0) {
 			cuda_error_message("CUDA nvcc compiler version could not be parsed.");
 			return false;

intern/cycles/graph/CMakeLists.txt

@@ -20,4 +20,3 @@ include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 
 cycles_add_library(cycles_graph ${SRC} ${SRC_HEADERS})
-

intern/cycles/kernel/CMakeLists.txt

@@ -520,4 +520,3 @@ delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SVM_HEADERS}" ${CYCLES_INSTAL
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_GEOM_HEADERS}" ${CYCLES_INSTALL_PATH}/source/kernel/geom)
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_UTIL_HEADERS}" ${CYCLES_INSTALL_PATH}/source/util)
 delayed_install(${CMAKE_CURRENT_SOURCE_DIR} "${SRC_SPLIT_HEADERS}" ${CYCLES_INSTALL_PATH}/source/kernel/split)
-

intern/cycles/kernel/closure/bsdf.h

@@ -72,7 +72,7 @@ ccl_device_inline float bsdf_get_roughness_squared(const ShaderClosure *sc)
 	return bsdf_get_specular_roughness_squared(sc);
 }
 
-ccl_device_forceinline int bsdf_sample(KernelGlobals *kg,
+ccl_device_inline int bsdf_sample(KernelGlobals *kg,
                                   ShaderData *sd,
                                   const ShaderClosure *sc,
                                   float randu,
@@ -210,7 +210,7 @@ ccl_device_forceinline int bsdf_sample(KernelGlobals *kg,
 #ifndef __KERNEL_CUDA__
 ccl_device
 #else
-ccl_device_forceinline
+ccl_device_inline
 #endif
 float3 bsdf_eval(KernelGlobals *kg,
                  ShaderData *sd,

intern/cycles/kernel/osl/CMakeLists.txt

@@ -31,4 +31,3 @@ include_directories(${INC})
 include_directories(SYSTEM ${INC_SYS})
 
 cycles_add_library(cycles_kernel_osl ${SRC} ${HEADER_SRC})
-

intern/cycles/kernel/shaders/CMakeLists.txt

@@ -127,4 +127,3 @@ cycles_set_solution_folder(cycles_osl_shaders)
 # CMAKE_CURRENT_SOURCE_DIR is already included in OSO paths
 delayed_install("" "${SRC_OSO}" ${CYCLES_INSTALL_PATH}/shader)
 delayed_install("${CMAKE_CURRENT_SOURCE_DIR}" "${SRC_OSL_HEADERS}" ${CYCLES_INSTALL_PATH}/shader)
-

intern/cycles/kernel/shaders/node_ambient_occlusion.osl

@@ -17,13 +17,13 @@
 #include "stdosl.h"
 
 shader node_ambient_occlusion(
-	color ColorIn = color(0.8, 0.8, 0.8),
+	color ColorIn = color(1.0, 1.0, 1.0),
-	int samples = 8,
+	int samples = 16,
 	float Distance = 1.0,
 	normal Normal = N,
 	int inside = 0,
-	int only_local = 1,
+	int only_local = 0,
-	output color ColorOut = color(0.8, 0.8, 0.8),
+	output color ColorOut = color(1.0, 1.0, 1.0),
 	output float AO = 1.0)
 {
 	int global_radius = (Distance == 0.0 && !isconnected(Distance));

intern/cycles/kernel/svm/svm.h

@@ -144,7 +144,6 @@ CCL_NAMESPACE_END
 #include "kernel/svm/svm_color_util.h"
 #include "kernel/svm/svm_math_util.h"
 
-#include "kernel/svm/svm_ao.h"
 #include "kernel/svm/svm_attribute.h"
 #include "kernel/svm/svm_gradient.h"
 #include "kernel/svm/svm_blackbody.h"
@@ -185,6 +184,7 @@ CCL_NAMESPACE_END
 #include "kernel/svm/svm_bump.h"
 
 #ifdef __SHADER_RAYTRACE__
+#  include "kernel/svm/svm_ao.h"
 #  include "kernel/svm/svm_bevel.h"
 #endif
 

intern/cycles/render/light.cpp

@@ -587,7 +587,7 @@ void LightManager::device_update_background(Device *device,
 	double time_start = time_dt();
 	if(max(res.x, res.y) < 512) {
 		/* Small enough resolution, faster to do single-threaded. */
-		background_cdf(0, res.x, res.x, res.y, &pixels, cond_cdf);
+		background_cdf(0, res.y, res.x, res.y, &pixels, cond_cdf);
 	}
 	else {
 		/* Threaded evaluation for large resolution. */

intern/cycles/render/nodes.cpp

@@ -2792,14 +2792,14 @@ NODE_DEFINE(AmbientOcclusionNode)
 {
 	NodeType* type = NodeType::add("ambient_occlusion", create, NodeType::SHADER);
 
-	SOCKET_INT(samples, "Samples", 8);
+	SOCKET_INT(samples, "Samples", 16);
 
-	SOCKET_IN_COLOR(color, "Color", make_float3(0.8f, 0.8f, 0.8f));
+	SOCKET_IN_COLOR(color, "Color", make_float3(1.0f, 1.0f, 1.0f));
 	SOCKET_IN_FLOAT(distance, "Distance", 1.0f);
 	SOCKET_IN_NORMAL(normal, "Normal", make_float3(0.0f, 0.0f, 0.0f), SocketType::LINK_NORMAL);
 
 	SOCKET_BOOLEAN(inside, "Inside", false);
-	SOCKET_BOOLEAN(only_local, "Only Local", true);
+	SOCKET_BOOLEAN(only_local, "Only Local", false);
 
 	SOCKET_OUT_COLOR(color, "Color");
 	SOCKET_OUT_FLOAT(ao, "AO");

intern/cycles/test/CMakeLists.txt

@@ -91,7 +91,8 @@ link_directories(${OPENIMAGEIO_LIBPATH}
                  ${JPEG_LIBPATH}
                  ${ZLIB_LIBPATH}
                  ${TIFF_LIBPATH}
-                 ${OPENEXR_LIBPATH})
+                 ${OPENEXR_LIBPATH}
+                 ${OPENCOLORIO_LIBPATH})
 
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} ${PLATFORM_LINKFLAGS_DEBUG}")

intern/cycles/util/util_ssef.h

@@ -606,7 +606,7 @@ ccl_device_inline const ssef uint32_to_float(const ssei &in)
 template<size_t S1, size_t S2, size_t S3, size_t S4>
 ccl_device_inline const ssef set_sign_bit(const ssef &a)
 {
-	return a ^ cast(ssei(S1 << 31, S2 << 31, S3 << 31, S4 << 31));
+	return cast(cast(a) ^ ssei(S1 << 31, S2 << 31, S3 << 31, S4 << 31));
 }
 
 ////////////////////////////////////////////////////////////////////////////////

intern/dualcon/CMakeLists.txt

@@ -46,4 +46,3 @@ set(SRC
 )
 
 blender_add_lib(bf_intern_dualcon "${SRC}" "${INC}" "${INC_SYS}")
-

intern/eigen/intern/matrix.cc

@@ -48,6 +48,9 @@ bool EIG_invert_m4_m4(float inverse[4][4], const float matrix[4][4])
 	Matrix4f R;
 	bool invertible = true;
 	M.computeInverseWithCheck(R, invertible, 0.0f);
+	if (!invertible) {
+		R = R.Zero();
+	}
 	memcpy(inverse, R.data(), sizeof(float)*4*4);
 	return invertible;
 }

intern/ghost/GHOST_IContext.h

@@ -75,4 +75,3 @@ public:
 };
 
 #endif // __GHOST_IContext_H__
-

intern/ghost/GHOST_IEvent.h

@@ -91,4 +91,3 @@ public:
 };
 
 #endif // __GHOST_IEVENT_H__
-

intern/ghost/GHOST_ISystem.h

@@ -462,4 +462,3 @@ protected:
 };
 
 #endif // __GHOST_ISYSTEM_H__
-

intern/ghost/GHOST_ITimerTask.h

@@ -91,4 +91,3 @@ public:
 };
 
 #endif // __GHOST_ITIMERTASK_H__
-

intern/ghost/GHOST_IWindow.h

@@ -368,4 +368,3 @@ public:
 };
 
 #endif // __GHOST_IWINDOW_H__
-

intern/ghost/GHOST_Rect.h

@@ -257,4 +257,3 @@ inline bool GHOST_Rect::isInside(GHOST_TInt32 x, GHOST_TInt32 y) const
 }
 
 #endif // __GHOST_RECT_H__
-

intern/ghost/GHOST_Types.h

@@ -557,4 +557,3 @@ typedef void (*GHOST_TimerProcPtr)(struct GHOST_TimerTaskHandle__ *task, GHOST_T
 #endif
 
 #endif // __GHOST_TYPES_H__
-

intern/ghost/intern/GHOST_Buttons.h

@@ -75,4 +75,3 @@ struct GHOST_Buttons {
 };
 
 #endif // __GHOST_BUTTONS_H__
-

intern/ghost/intern/GHOST_CallbackEventConsumer.h

@@ -80,4 +80,3 @@ protected:
 };
 
 #endif // __GHOST_CALLBACKEVENTCONSUMER_H__
-

intern/ghost/intern/GHOST_Debug.h

@@ -84,4 +84,3 @@
 #endif // GHOST_DEBUG
 
 #endif // __GHOST_DEBUG_H__
-

intern/ghost/intern/GHOST_DisplayManager.h

@@ -142,4 +142,3 @@ protected:
 
 
 #endif // __GHOST_DISPLAYMANAGER_H__
-

intern/ghost/intern/GHOST_DisplayManagerCocoa.h

@@ -103,4 +103,3 @@ protected:
 
 
 #endif // __GHOST_DISPLAYMANAGERCOCOA_H__
-

intern/ghost/intern/GHOST_DisplayManagerWin32.h

@@ -98,4 +98,3 @@ protected:
 
 
 #endif // __GHOST_DISPLAYMANAGERWIN32_H__
-

intern/ghost/intern/GHOST_DisplayManagerX11.h

@@ -120,4 +120,3 @@ private:
 
 
 #endif //
-

intern/ghost/intern/GHOST_DropTargetWin32.cpp

@@ -392,4 +392,3 @@ void printLastError(void)
 	}
 }
 #endif // GHOST_DEBUG
-

intern/ghost/intern/GHOST_Event.h

@@ -104,4 +104,3 @@ protected:
 };
 
 #endif // __GHOST_EVENT_H__
-

intern/ghost/intern/GHOST_EventButton.h

@@ -63,4 +63,3 @@ protected:
 };
 
 #endif // __GHOST_EVENTBUTTON_H__
-

intern/ghost/intern/GHOST_EventCursor.h

@@ -65,4 +65,3 @@ protected:
 
 
 #endif // __GHOST_EVENTCURSOR_H__
-

intern/ghost/intern/GHOST_EventDragnDrop.h

@@ -133,4 +133,3 @@ protected:
 };
 
 #endif // __GHOST_EVENTDRAGNDROP_H__
-

intern/ghost/intern/GHOST_EventKey.h

@@ -89,4 +89,3 @@ protected:
 };
 
 #endif // __GHOST_EVENTKEY_H__
-

intern/ghost/intern/GHOST_EventManager.h

@@ -161,4 +161,3 @@ protected:
 };
 
 #endif // __GHOST_EVENTMANAGER_H__
-

intern/ghost/intern/GHOST_EventPrinter.cpp

@@ -338,4 +338,3 @@ void GHOST_EventPrinter::getKeyString(GHOST_TKey key, char str[32]) const
 		sprintf(str, "%s", tstr);
 	}
 }
-

intern/ghost/intern/GHOST_EventPrinter.h

@@ -61,4 +61,3 @@ protected:
 };
 
 #endif // __GHOST_EVENTPRINTER_H__
-

intern/ghost/intern/GHOST_EventString.h

@@ -64,4 +64,3 @@ public:
 };
 
 #endif // __GHOST_EVENTSTRING_H__
-

intern/ghost/intern/GHOST_EventTrackpad.h

@@ -72,4 +72,3 @@ protected:
 
 
 #endif // _GHOST_EVENT_PAN_H_
-

intern/ghost/intern/GHOST_EventWheel.h

@@ -65,4 +65,3 @@ protected:
 
 
 #endif // __GHOST_EVENTWHEEL_H__
-

intern/ghost/intern/GHOST_ISystem.cpp

@@ -105,4 +105,3 @@ GHOST_ISystem *GHOST_ISystem::getSystem()
 {
 	return m_system;
 }
-

intern/ghost/intern/GHOST_ISystemPaths.cpp

@@ -96,6 +96,3 @@ GHOST_ISystemPaths *GHOST_ISystemPaths::get()
 	}
 	return m_systemPaths;
 }
-
-
-

intern/ghost/intern/GHOST_ModifierKeys.h

@@ -100,4 +100,3 @@ struct GHOST_ModifierKeys {
 };
 
 #endif // __GHOST_MODIFIERKEYS_H__
-

intern/ghost/intern/GHOST_Rect.cpp

@@ -138,4 +138,3 @@ bool GHOST_Rect::clip(GHOST_Rect& r) const
 	}
 	return clipped;
 }
-

intern/ghost/intern/GHOST_System.cpp

@@ -390,4 +390,3 @@ bool GHOST_System::useNativePixel(void)
 	m_nativePixel = true;
 	return 1;
 }
-

intern/ghost/intern/GHOST_System.h

@@ -396,4 +396,3 @@ inline GHOST_NDOFManager *GHOST_System::getNDOFManager() const
 #endif
 
 #endif // __GHOST_SYSTEM_H__
-

intern/ghost/intern/GHOST_SystemCocoa.h

@@ -323,4 +323,3 @@ protected:
 };
 
 #endif // __GHOST_SYSTEMCOCOA_H__
-

intern/ghost/intern/GHOST_SystemPaths.h

@@ -77,5 +77,3 @@ public:
 };
 
 #endif
-
-

intern/ghost/intern/GHOST_SystemPathsWin32.h

@@ -90,4 +90,3 @@ public:
 };
 
 #endif // __GHOST_SYSTEMPATHSWIN32_H__
-

intern/ghost/intern/GHOST_SystemWin32.cpp

@@ -325,7 +325,8 @@ GHOST_IContext *GHOST_SystemWin32::createOffscreenContext()
 	);
 
 	HDC  mHDC = GetDC(wnd);
-
+	HDC  prev_hdc = wglGetCurrentDC();
+	HGLRC prev_context = wglGetCurrentContext();
 #if defined(WITH_GL_PROFILE_CORE)
 	for (int minor = 5; minor >= 0; --minor) {
 			context = new GHOST_ContextWGL(
@@ -337,7 +338,7 @@ GHOST_IContext *GHOST_SystemWin32::createOffscreenContext()
 			    GHOST_OPENGL_WGL_RESET_NOTIFICATION_STRATEGY);
 
 			if (context->initializeDrawingContext()) {
-				return context;
+				goto finished;
 			}
 			else {
 				delete context;
@@ -353,7 +354,7 @@ GHOST_IContext *GHOST_SystemWin32::createOffscreenContext()
 		    GHOST_OPENGL_WGL_RESET_NOTIFICATION_STRATEGY);
 
 		if (context->initializeDrawingContext()) {
-			return context;
+			goto finished;
 		}
 		else {
 			MessageBox(
@@ -386,8 +387,9 @@ GHOST_IContext *GHOST_SystemWin32::createOffscreenContext()
 #else
 #  error // must specify either core or compat at build time
 #endif
-
+finished:
-	return NULL;
+	wglMakeCurrent(prev_hdc, prev_context);
+	return context;
 }
 
 /**

intern/ghost/intern/GHOST_SystemX11.h

@@ -438,4 +438,3 @@ private:
 };
 
 #endif
-

intern/ghost/intern/GHOST_TimerManager.h

@@ -127,4 +127,3 @@ protected:
 };
 
 #endif // __GHOST_TIMERMANAGER_H__
-

intern/ghost/intern/GHOST_TimerTask.h

@@ -193,4 +193,3 @@ protected:
 };
 
 #endif // __GHOST_TIMERTASK_H__
-

intern/ghost/intern/GHOST_Window.cpp

@@ -242,4 +242,3 @@ bool GHOST_Window::getModifiedState()
 {
 	return m_isUnsavedChanges;
 }
-

intern/ghost/intern/GHOST_Window.h

@@ -461,4 +461,3 @@ inline GHOST_TStandardCursor GHOST_Window::getCursorShape() const
 }
 
 #endif // _GHOST_WINDOW_H
-

intern/ghost/intern/GHOST_WindowManager.h

@@ -168,4 +168,3 @@ protected:
 };
 
 #endif // __GHOST_WINDOWMANAGER_H__
-

intern/ghost/test/multitest/Basic.h

@@ -38,4 +38,3 @@ void	rect_copy			(int dst[2][2], int src[2][2]);
 int		rect_contains_pt	(int rect[2][2], int pt[2]);
 int		rect_width			(int rect[2][2]);
 int		rect_height			(int rect[2][2]);
-

intern/ghost/test/multitest/EventToBuf.h

@@ -27,4 +27,3 @@
 
 char *eventtype_to_string(GHOST_TEventType type);
 void event_to_buf(GHOST_EventHandle evt, char buf[128]);
-

intern/ghost/test/multitest/GL.h

@@ -37,4 +37,3 @@
 #else // defined(WIN32) || defined(__APPLE__)
 	#include <GL/gl.h>
 #endif // defined(WIN32) || defined(__APPLE__)
-

intern/ghost/test/multitest/ScrollBar.h

@@ -50,4 +50,3 @@ void		scrollbar_get_rect			(ScrollBar *sb, int rect_r[2][2]);
 void		scrollbar_get_thumb			(ScrollBar *sb, int thumb_r[2][2]);
 
 void		scrollbar_free				(ScrollBar *sb);
-

intern/ghost/test/multitest/Util.h

@@ -29,4 +29,3 @@ void*	memdbl		(void *mem, int *size_pr, int item_size);
 
 char*	string_dup	(char *str);
 void	fatal		(char *fmt, ...);
-

intern/ghost/test/multitest/WindowData.h

@@ -33,4 +33,3 @@ typedef struct _WindowData WindowData;
 WindowData*	windowdata_new		(void *data, WindowDataHandler handler);
 void		windowdata_handle	(WindowData *wb, GHOST_EventHandle evt);
 void		windowdata_free		(WindowData *wb);
-

intern/mikktspace/CMakeLists.txt

@@ -45,4 +45,3 @@ set(SRC
 )
 
 blender_add_lib(bf_intern_mikktspace "${SRC}" "${INC}" "${INC_SYS}")
-