[Bf-blender-cvs] [f512890d89a] greasepencil-object: Merge branch 'master' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Wed Feb 19 19:17:21 CET 2020


Commit: f512890d89a973ddecdb57dfdb35e340b13d40d3
Author: Antonio Vazquez
Date:   Wed Feb 19 19:17:13 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBf512890d89a973ddecdb57dfdb35e340b13d40d3

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/makesdna/intern/dna_rename_defs.h

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



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

diff --cc source/blender/makesdna/intern/dna_rename_defs.h
index 78140281424,1ae7ad6bc70..678baef3cef
--- a/source/blender/makesdna/intern/dna_rename_defs.h
+++ b/source/blender/makesdna/intern/dna_rename_defs.h
@@@ -109,7 -109,4 +109,8 @@@ DNA_STRUCT_RENAME_ELEM(bTheme, tstatusb
  DNA_STRUCT_RENAME_ELEM(bTheme, ttopbar, space_topbar)
  DNA_STRUCT_RENAME_ELEM(bTheme, tuserpref, space_preferences)
  DNA_STRUCT_RENAME_ELEM(bTheme, tv3d, space_view3d)
+ DNA_STRUCT_RENAME_ELEM(ThemeSpace, show_back_grad, background_type)
 +DNA_STRUCT_RENAME_ELEM(bGPDstroke, gradient_f, hardeness)
 +DNA_STRUCT_RENAME_ELEM(bGPDstroke, gradient_s, aspect_ratio)
 +DNA_STRUCT_RENAME_ELEM(BrushGpencilSettings, gradient_f, hardeness)
 +DNA_STRUCT_RENAME_ELEM(BrushGpencilSettings, gradient_s, aspect_ratio)



More information about the Bf-blender-cvs mailing list