Merge branch 'master' into blender2.8

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/cmake/Modules/FindLLVM.cmake

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

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_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);
-

release/scripts/modules/keyingsets_utils.py

@@ -258,4 +258,3 @@ def RKS_GEN_bendy_bones(ksi, context, ks, data):
             ks.paths.add(id_block, path, group_method='NAMED', group_name=grouping)
         else:
             ks.paths.add(id_block, path)
-

release/scripts/startup/bl_operators/bmesh/find_adjacent.py

@@ -350,4 +350,3 @@ def select_prev(bm, report):
             break
 
     return True
-

source/blender/blenlib/BLI_boxpack_2d.h

@@ -50,4 +50,3 @@ typedef struct BoxPack {
 void BLI_box_pack_2d(BoxPack *boxarray, const unsigned int len, float *tot_width, float *tot_height);
 
 #endif  /* __BLI_BOXPACK_2D_H__ */
-

source/blender/blenlib/BLI_dynlib.h

@@ -40,4 +40,3 @@ char *BLI_dynlib_get_error_as_string(DynamicLibrary *lib);
 void BLI_dynlib_close(DynamicLibrary *lib);
 
 #endif /* __BLI_DYNLIB_H__ */
-

source/blender/blenlib/BLI_fileops_types.h

@@ -66,4 +66,3 @@ struct dirlink {
 };
 
 #endif /* __BLI_FILEOPS_TYPES_H__ */
-

source/blender/blenlib/BLI_jitter_2d.h

@@ -37,4 +37,3 @@ void BLI_jitterate1(float (*jit1)[2], float (*jit2)[2], int num, float radius1);
 void BLI_jitterate2(float (*jit1)[2], float (*jit2)[2], int num, float radius2);
 
 #endif  /* __BLI_JITTER_2D_H__ */
-

source/blender/blenlib/BLI_linklist_stack.h

@@ -199,4 +199,3 @@
 /** \} */
 
 #endif  /* __BLI_LINKLIST_STACK_H__ */
-

source/blender/blenlib/BLI_math_color_blend.h

@@ -106,4 +106,3 @@ MINLINE void blend_color_interpolate_float(float dst[4], const float src1[4], co
 #endif
 
 #endif /* __BLI_MATH_COLOR_BLEND_H__ */
-

source/blender/blenlib/BLI_math_geom.h

@@ -545,4 +545,3 @@ float cubic_tangent_factor_circle_v3(const float tan_l[3], const float tan_r[3])
 #endif
 
 #endif /* __BLI_MATH_GEOM_H__ */
-

source/blender/blenlib/BLI_math_matrix.h

@@ -314,4 +314,3 @@ void print_m4(const char *str, const float M[4][4]);
 #endif
 
 #endif /* __BLI_MATH_MATRIX_H__ */
-

source/blender/blenlib/BLI_math_rotation.h

@@ -235,4 +235,3 @@ bool mat3_from_axis_conversion_single(
 #endif
 
 #endif /* __BLI_MATH_ROTATION_H__ */
-

source/blender/blenlib/BLI_math_solvers.h

@@ -69,4 +69,3 @@ bool BLI_tridiagonal_solve_cyclic(const float *a, const float *b, const float *c
 #endif
 
 #endif /* __BLI_MATH_SOLVERS_H__ */
-

source/blender/blenlib/BLI_math_statistics.h

@@ -67,4 +67,3 @@ void BLI_covariance_m3_v3n(
 #endif
 
 #endif /* __BLI_MATH_STATISTICS_H__ */
-

source/blender/blenlib/BLI_scanfill.h

@@ -139,4 +139,3 @@ bool BLI_scanfill_calc_self_isect(
 #endif
 
 #endif
-

source/blender/blenlib/BLI_task.h

@@ -227,4 +227,3 @@ BLI_INLINE void BLI_parallel_range_settings_defaults(
 #endif
 
 #endif
-

source/blender/blenlib/BLI_threads.h

@@ -209,4 +209,3 @@ void BLI_thread_queue_nowait(ThreadQueue *queue);
 #endif
 
 #endif
-

source/blender/blenlib/BLI_vfontdata.h

@@ -58,4 +58,3 @@ VChar *BLI_vfontchar_from_freetypefont(struct VFont *vfont, unsigned long charac
 VChar *BLI_vfontchar_copy(const VChar *vchar_src, const int flag);
 
 #endif
-

source/blender/blenlib/BLI_winstuff.h

@@ -138,4 +138,3 @@ int BLI_getInstallationDir(char *str);
 #endif
 
 #endif /* __BLI_WINSTUFF_H__ */
-

source/blender/blenlib/intern/BLI_heap.c

@@ -418,4 +418,3 @@ bool BLI_heap_is_valid(const Heap *heap)
 }
 
 /** \} */
-

source/blender/blenlib/intern/dynlib.c

@@ -138,4 +138,3 @@ void BLI_dynlib_close(DynamicLibrary *lib)
 }
 
 #endif
-

source/blender/blenlib/intern/fnmatch.c

@@ -242,5 +242,3 @@ fnmatch (const char *pattern, const char *string, int flags)
 /* intentionally empty for UNIX */
 
 #endif /* WIN32 */
-
-

source/blender/blenlib/intern/hash_mm2a.c

@@ -144,4 +144,3 @@ uint32_t BLI_hash_mm2(const unsigned char *data, size_t len, uint32_t seed)
 
 	return h;
 }
-

source/blender/blenlib/intern/math_solvers.c

@@ -179,4 +179,3 @@ bool BLI_tridiagonal_solve_cyclic(const float *a, const float *b, const float *c
 
 	return success;
 }
-

source/blender/blenlib/intern/threads.c

@@ -840,4 +840,3 @@ void BLI_threaded_malloc_end(void)
 		MEM_set_lock_callback(NULL, NULL);
 	}
 }
-

source/blender/bmesh/intern/bmesh_mods.c

@@ -1104,4 +1104,3 @@ BMVert *BM_face_loop_separate_multi(BMesh *bm, BMLoop **larr, int larr_len)
 {
 	return bmesh_kernel_unglue_region_make_vert_multi(bm, larr, larr_len);
 }
-

source/blender/bmesh/operators/bmo_beautify.c

@@ -82,4 +82,3 @@ void bmo_beautify_fill_exec(BMesh *bm, BMOperator *op)
 
 	BMO_slot_buffer_from_enabled_flag(bm, op, op->slots_out, "geom.out", BM_EDGE | BM_FACE, ELE_NEW);
 }
-

source/blender/bmesh/operators/bmo_smooth_laplacian.c

@@ -543,4 +543,3 @@ void bmo_smooth_laplacian_vert_exec(BMesh *bm, BMOperator *op)
 
 	delete_laplacian_system(sys);
 }
-

source/blender/bmesh/tools/bmesh_beautify.c

@@ -456,4 +456,3 @@ void BM_mesh_beautify_fill(
 	TIMEIT_END(beautify_fill);
 #endif
 }
-

source/blender/collada/ErrorHandler.h

@@ -53,4 +53,3 @@ private:
 	/** Hold error status. */
 	bool mError;
 };
-

source/blender/collada/ExtraHandler.h

@@ -83,4 +83,3 @@ private:
 	ExtraTags* currentExtraTags;
 	std::string currentElement;
 };
-

source/blender/collada/GeometryExporter.cpp

@@ -680,5 +680,3 @@ COLLADASW::URI GeometryExporter::makeUrl(std::string id)
 {
 	return COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, id);
 }
-
-

source/blender/collada/SceneExporter.cpp

@@ -241,4 +241,3 @@ void SceneExporter::writeNodes(bContext *C, Depsgraph *depsgraph, Object *ob, Sc
 	if (ob->type != OB_ARMATURE)
 		colladaNode.end();
 }
-

source/blender/collada/collada_internal.cpp

@@ -351,4 +351,3 @@ std::string get_morph_id(Object *ob)
 {
 	return translate_id(id_name(ob)) + "-morph";
 }
-

source/blender/draw/engines/eevee/shaders/ltc_lib.glsl

@@ -319,4 +319,3 @@ float ltc_evaluate_disk(vec3 N, vec3 V, mat3 Minv, vec3 disk_points[3])
 	return form_factor * diffuse_sphere_integral_cheap(avg_dir.z, form_factor);
 #endif
 }
-

source/blender/draw/engines/workbench/shaders/workbench_forward_depth_frag.glsl

@@ -5,4 +5,3 @@ void main()
 {
 	objectId = uint(object_id);
 }
-

source/blender/draw/engines/workbench/shaders/workbench_forward_transparent_accum_frag.glsl

@@ -80,4 +80,3 @@ void main()
 	transparentAccum = vec4(shaded_color * weight, alpha);
 	revealageAccum = weight;
 }
-

source/blender/draw/engines/workbench/solid_mode.c

@@ -99,4 +99,3 @@ DrawEngineType draw_engine_workbench_solid = {
 	NULL,
 	NULL,
 };
-

source/blender/draw/engines/workbench/transparent_mode.c

@@ -93,4 +93,3 @@ DrawEngineType draw_engine_workbench_transparent = {
 	NULL,
 	NULL,
 };
-

source/blender/draw/engines/workbench/workbench_effect_fxaa.c

@@ -60,4 +60,3 @@ void workbench_fxaa_engine_free(void)
 {
 	DRW_SHADER_FREE_SAFE(e_data.effect_fxaa_sh);
 }
-

source/blender/draw/intern/draw_anim_viz.c

@@ -348,4 +348,3 @@ DrawEngineType draw_engine_motion_path_type = {
 	NULL,
 	NULL,
 };
-

source/blender/draw/modes/overlay_mode.c

@@ -246,4 +246,3 @@ DrawEngineType draw_engine_overlay_type = {
 	NULL,
 	NULL,
 };
-

source/blender/draw/modes/shaders/common_fxaa_lib.glsl

@@ -675,4 +675,3 @@ vec4 FxaaPixelShader(
     return vec4(FxaaTexTop(tex, posM).xyz, lumaM);
 }
 /*==========================================================================*/
-

source/blender/editors/animation/keyframes_draw.c

@@ -1057,4 +1057,3 @@ void mask_to_keylist(bDopeSheet *UNUSED(ads), MaskLayer *masklay, DLRBT_Tree *ke
 		}
 	}
 }
-

source/blender/editors/animation/keyframes_edit.c

@@ -1471,4 +1471,3 @@ short bezt_selmap_flush(KeyframeEditData *ked, BezTriple *bezt)
 
 	return 0;
 }
-

source/blender/editors/armature/armature_intern.h

@@ -251,4 +251,3 @@ int bone_looper(struct Object *ob, struct Bone *bone, void *data,
 
 
 #endif /* __ARMATURE_INTERN_H__ */
-

source/blender/editors/armature/armature_naming.c

@@ -468,4 +468,3 @@ void ARMATURE_OT_autoside_names(wmOperatorType *ot)
 	/* settings */
 	ot->prop = RNA_def_enum(ot->srna, "type", axis_items, 0, "Axis", "Axis tag names with");
 }
-

source/blender/editors/armature/armature_ops.c

@@ -395,4 +395,3 @@ void ED_keymap_armature(wmKeyConfig *keyconf)
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_pose_specials", WKEY, KM_PRESS, 0, 0);
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_pose_propagate", PKEY, KM_PRESS, KM_ALT, 0);
 }
-

source/blender/editors/armature/armature_relations.c

@@ -909,4 +909,3 @@ void ARMATURE_OT_parent_clear(wmOperatorType *ot)
 
 	ot->prop = RNA_def_enum(ot->srna, "type", prop_editarm_clear_parent_types, 0, "ClearType", "What way to clear parenting");
 }
-