[Bf-blender-cvs] [7f4f933e6b0] greasepencil-object: GPencil: Rename gradient variables
Antonio Vazquez
noreply at git.blender.org
Thu Feb 13 11:16:41 CET 2020
Commit: 7f4f933e6b0aa2bea40d0e7f9d2273e6df4a52b2
Author: Antonio Vazquez
Date: Thu Feb 13 11:16:30 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB7f4f933e6b0aa2bea40d0e7f9d2273e6df4a52b2
GPencil: Rename gradient variables
gradient_f -> hardeness
gradient_s ->aspect_ratio
===================================================================
M source/blender/blenkernel/intern/brush.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/draw/intern/draw_cache_impl_gpencil.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/gpencil_fill.c
M source/blender/editors/gpencil/gpencil_merge.c
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_primitive.c
M source/blender/editors/space_view3d/view3d_gizmo_ruler.c
M source/blender/makesdna/DNA_brush_types.h
M source/blender/makesdna/DNA_gpencil_types.h
M source/blender/makesdna/intern/dna_rename_defs.h
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_gpencil.c
===================================================================
diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c
index d3520b4ae44..6598786c7d8 100644
--- a/source/blender/blenkernel/intern/brush.c
+++ b/source/blender/blenkernel/intern/brush.c
@@ -309,9 +309,9 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gradient_f = 0.211f;
- brush->gpencil_settings->gradient_s[0] = 1.0f;
- brush->gpencil_settings->gradient_s[1] = 1.0f;
+ brush->gpencil_settings->hardeness = 0.211f;
+ brush->gpencil_settings->aspect_ratio[0] = 1.0f;
+ brush->gpencil_settings->aspect_ratio[1] = 1.0f;
brush->gpencil_tool = GPAINT_TOOL_DRAW;
brush->gpencil_settings->icon_id = GP_BRUSH_ICON_AIRBRUSH;
@@ -345,9 +345,9 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gradient_f = 1.0f;
- brush->gpencil_settings->gradient_s[0] = 1.0f;
- brush->gpencil_settings->gradient_s[1] = 1.0f;
+ brush->gpencil_settings->hardeness = 1.0f;
+ brush->gpencil_settings->aspect_ratio[0] = 1.0f;
+ brush->gpencil_settings->aspect_ratio[1] = 1.0f;
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 0.1f;
@@ -385,9 +385,9 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gradient_f = 1.0f;
- brush->gpencil_settings->gradient_s[0] = 1.0f;
- brush->gpencil_settings->gradient_s[1] = 1.0f;
+ brush->gpencil_settings->hardeness = 1.0f;
+ brush->gpencil_settings->aspect_ratio[0] = 1.0f;
+ brush->gpencil_settings->aspect_ratio[1] = 1.0f;
brush->gpencil_settings->flag &= ~GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 0.0f;
@@ -427,9 +427,9 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gradient_f = 1.0f;
- brush->gpencil_settings->gradient_s[0] = 1.0f;
- brush->gpencil_settings->gradient_s[1] = 1.0f;
+ brush->gpencil_settings->hardeness = 1.0f;
+ brush->gpencil_settings->aspect_ratio[0] = 1.0f;
+ brush->gpencil_settings->aspect_ratio[1] = 1.0f;
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 0.1f;
@@ -469,9 +469,9 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = DEG2RAD(20.0f);
brush->gpencil_settings->draw_angle_factor = 1.0f;
- brush->gpencil_settings->gradient_f = 1.0f;
- brush->gpencil_settings->gradient_s[0] = 1.0f;
- brush->gpencil_settings->gradient_s[1] = 1.0f;
+ brush->gpencil_settings->hardeness = 1.0f;
+ brush->gpencil_settings->aspect_ratio[0] = 1.0f;
+ brush->gpencil_settings->aspect_ratio[1] = 1.0f;
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 0.0f;
@@ -505,9 +505,9 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gradient_f = 1.0f;
- brush->gpencil_settings->gradient_s[0] = 1.0f;
- brush->gpencil_settings->gradient_s[1] = 1.0f;
+ brush->gpencil_settings->hardeness = 1.0f;
+ brush->gpencil_settings->aspect_ratio[0] = 1.0f;
+ brush->gpencil_settings->aspect_ratio[1] = 1.0f;
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 0.0f;
@@ -541,9 +541,9 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gradient_f = 0.8f;
- brush->gpencil_settings->gradient_s[0] = 1.0f;
- brush->gpencil_settings->gradient_s[1] = 1.0f;
+ brush->gpencil_settings->hardeness = 0.8f;
+ brush->gpencil_settings->aspect_ratio[0] = 1.0f;
+ brush->gpencil_settings->aspect_ratio[1] = 1.0f;
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 0.0f;
@@ -577,9 +577,9 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->active_smooth = ACTIVE_SMOOTH;
brush->gpencil_settings->draw_angle = 0.0f;
brush->gpencil_settings->draw_angle_factor = 0.0f;
- brush->gpencil_settings->gradient_f = 1.0f;
- brush->gpencil_settings->gradient_s[0] = 1.0f;
- brush->gpencil_settings->gradient_s[1] = 1.0f;
+ brush->gpencil_settings->hardeness = 1.0f;
+ brush->gpencil_settings->aspect_ratio[0] = 1.0f;
+ brush->gpencil_settings->aspect_ratio[1] = 1.0f;
brush->gpencil_settings->flag |= GP_BRUSH_GROUP_SETTINGS;
brush->gpencil_settings->draw_smoothfac = 0.0f;
@@ -610,9 +610,9 @@ void BKE_gpencil_brush_preset_set(Main *bmain, Brush *brush, const short type)
brush->gpencil_settings->fill_factor = 1;
brush->gpencil_settings->draw_strength = 1.0f;
- brush->gpencil_settings->gradient_f = 1.0f;
- brush->gpencil_settings->gradient_s[0] = 1.0f;
- brush->gpencil_settings->gradient_s[1] = 1.0f;
+ brush->gpencil_settings->hardeness = 1.0f;
+ brush->gpencil_settings->aspect_ratio[0] = 1.0f;
+ brush->gpencil_settings->aspect_ratio[1] = 1.0f;
brush->gpencil_settings->draw_smoothfac = 0.1f;
brush->gpencil_settings->draw_smoothlvl = 1;
brush->gpencil_settings->draw_subdivide = 1;
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index a0bd57a2a36..61ae9e31f18 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -494,9 +494,9 @@ bGPDstroke *BKE_gpencil_stroke_new(int mat_idx, int totpoints, short thickness)
gps->thickness = thickness;
gps->fill_opacity_fac = 1.0f;
- gps->gradient_f = 1.0f;
- gps->gradient_s[0] = 1.0f;
- gps->gradient_s[1] = 1.0f;
+ gps->hardeness = 1.0f;
+ gps->aspect_ratio[0] = 1.0f;
+ gps->aspect_ratio[1] = 1.0f;
gps->uv_scale = 1.0f;
@@ -3387,10 +3387,10 @@ static void gpencil_convert_spline(Main *bmain,
bGPDstroke *gps = MEM_callocN(sizeof(bGPDstroke), "bGPDstroke");
gps->thickness = 1.0f;
gps->fill_opacity_fac = 1.0f;
- gps->gradient_f = 1.0f;
+ gps->hardeness = 1.0f;
gps->uv_scale = 1.0f;
- ARRAY_SET_ITEMS(gps->gradient_s, 1.0f, 1.0f);
+ ARRAY_SET_ITEMS(gps->aspect_ratio, 1.0f, 1.0f);
ARRAY_SET_ITEMS(gps->caps, GP_STROKE_CAP_ROUND, GP_STROKE_CAP_ROUND);
gps->inittime = 0.0f;
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index dcf2f1cab7e..013817d1887 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -14,11 +14,11 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
- /** \file
- * \ingroup blenloader
- */
+/** \file
+ * \ingroup blenloader
+ */
- /* allow readfile to use deprecated functionality */
+/* allow readfile to use deprecated functionality */
#define DNA_DEPRECATED_ALLOW
#include <string.h>
@@ -108,73 +108,73 @@
/* Make preferences read-only, use versioning_userdef.c. */
#define U (*((const UserDef *)&U))
-static bScreen* screen_parent_find(const bScreen* screen)
+static bScreen *screen_parent_find(const bScreen *screen)
{
- /* Can avoid lookup if screen state isn't maximized/full
- * (parent and child store the same state). */
- if (ELEM(screen->state, SCREENMAXIMIZED, SCREENFULL)) {
- for (const ScrArea* sa = screen->areabase.first; sa; sa = sa->next) {
- if (sa->full && sa->full != screen) {
- BLI_assert(sa->full->state == screen->state);
- return sa->full;
- }
- }
- }
-
- return NULL;
+ /* Can avoid lookup if screen state isn't maximized/full
+ * (parent and child store the same state). */
+ if (ELEM(screen->state, SCREENMAXIMIZED, SCREENFULL)) {
+ for (const ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
+ if (sa->full && sa->full != screen) {
+ BLI_assert(sa->full->state == screen->state);
+ return sa->full;
+ }
+ }
+ }
+
+ return NULL;
}
-static void do_version_workspaces_create_from_screens(Main* bmain)
+static void do_version_workspaces_create_from_screens(Main *bmain)
{
- for (bScreen* screen = bmain->screens.first; screen; screen = screen->id.next) {
- const bScreen* screen_parent = screen_parent_find(screen);
- WorkSpace* workspace;
- if (screen->temp) {
- continue;
- }
-
- if (screen_parent) {
- /* Full-screen with "Back to Previous" option, don't create
- * a new workspace, add layout workspace containing parent. */
- workspace = BLI_findstring(
- &bmain->workspaces, screen_parent->id.name + 2, offsetof(ID, name) + 2);
- }
- else {
- workspace = BKE_workspace_add(bmain, screen->id.name + 2);
- }
- if (workspace == NULL) {
- continue; /* Not much we can do.. */
- }
- BKE_workspace_layout_add(bmain, workspace, screen, screen->id.name + 2);
- }
+ for (bSc
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list