[Bf-blender-cvs] [ff205774206] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Mon Jul 9 09:49:28 CEST 2018


Commit: ff205774206ed2fa0da4c22fa980c2b3daf27f4d
Author: Antonio Vazquez
Date:   Mon Jul 9 09:49:19 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBff205774206ed2fa0da4c22fa980c2b3daf27f4d

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/editors/include/UI_interface.h
index 3e024bda271,d23748356fa..753fdd07567
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@@ -1039,12 -1047,10 +1047,13 @@@ void uiTemplateSearchPreview
          struct PointerRNA *searchptr, const char *searchpropname,
          const char *newop, const char *unlinkop,
          const int rows, const int cols);
- void uiTemplatePathBuilder(uiLayout *layout, struct PointerRNA *ptr, const char *propname,
-                            struct PointerRNA *root_ptr, const char *text);
+ void uiTemplatePathBuilder(
+         uiLayout *layout, struct PointerRNA *ptr, const char *propname,
+         struct PointerRNA *root_ptr, const char *text);
  uiLayout *uiTemplateModifier(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr);
 +uiLayout *uiTemplateGpencilModifier(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr);
 +
 +uiLayout *uiTemplateShaderFx(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr);
  
  void uiTemplateOperatorRedoProperties(uiLayout *layout, const struct bContext *C);



More information about the Bf-blender-cvs mailing list