[Bf-blender-cvs] [76e0123700c] greasepencil-object: GPencil: Fix error after merge

Antonioya noreply at git.blender.org
Wed Aug 7 12:16:18 CEST 2019


Commit: 76e0123700c0f8385bc403b06ad0dd6d66b7c48f
Author: Antonioya
Date:   Wed Aug 7 12:13:53 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB76e0123700c0f8385bc403b06ad0dd6d66b7c48f

GPencil: Fix error after merge

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

M	source/blender/editors/gpencil/gpencil_intern.h
M	source/blender/editors/gpencil/gpencil_svg.c
M	source/blender/editors/object/object_hook.c
M	source/blender/editors/space_clip/clip_graph_draw.c
M	source/blender/editors/space_clip/clip_graph_ops.c
M	source/blender/editors/space_clip/clip_intern.h
M	source/blender/editors/space_clip/clip_utils.c
M	source/blender/editors/space_clip/tracking_ops_solve.c

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

diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h
index 8d030a7f464..f9f4e31f5ce 100644
--- a/source/blender/editors/gpencil/gpencil_intern.h
+++ b/source/blender/editors/gpencil/gpencil_intern.h
@@ -646,7 +646,7 @@ struct GP_EditableStrokes_Iter {
 #define GP_DERIVED_STROKES_BEGIN(gpstroke_iter, C, gpl, gps) \
   { \
     struct GP_EditableStrokes_Iter gpstroke_iter = {{{0}}}; \
-    Depsgraph *depsgraph_ = CTX_data_depsgraph(C); \
+    Depsgraph *depsgraph_ = CTX_data_ensure_evaluated_depsgraph(C); \
     Object *obact_ = CTX_data_active_object(C); \
     Object *obeval_ = DEG_get_evaluated_object(depsgraph_, obact_); \
     bGPdata *gpd_ = CTX_data_gpencil_data(C); \
diff --git a/source/blender/editors/gpencil/gpencil_svg.c b/source/blender/editors/gpencil/gpencil_svg.c
index f2e9813e55b..56950b3009c 100644
--- a/source/blender/editors/gpencil/gpencil_svg.c
+++ b/source/blender/editors/gpencil/gpencil_svg.c
@@ -89,9 +89,6 @@ void GPENCIL_OT_export_svg(wmOperatorType *ot)
   ot->exec = gpencil_export_svg_exec;
   ot->poll = gpencil_export_svg_poll;
 
-  /* flag */
-  ot->flag = OPTYPE_USE_EVAL_DATA;
-
   /* properties */
   /* Should have: facing, layer, visibility, file split... */
 }
diff --git a/source/blender/editors/object/object_hook.c b/source/blender/editors/object/object_hook.c
index 56221ad8202..15c5ea40991 100644
--- a/source/blender/editors/object/object_hook.c
+++ b/source/blender/editors/object/object_hook.c
@@ -52,6 +52,7 @@
 
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_build.h"
+#include "DEG_depsgraph_query.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
diff --git a/source/blender/editors/space_clip/clip_graph_draw.c b/source/blender/editors/space_clip/clip_graph_draw.c
index df82e878039..3f705aad89a 100644
--- a/source/blender/editors/space_clip/clip_graph_draw.c
+++ b/source/blender/editors/space_clip/clip_graph_draw.c
@@ -48,6 +48,7 @@
 #include "clip_intern.h"  // own include
 
 typedef struct TrackMotionCurveUserData {
+  SpaceClip *sc;
   MovieTrackingTrack *act_track;
   bool sel;
   float xscale, yscale, hsize;
@@ -72,13 +73,28 @@ static void tracking_segment_point_cb(void *userdata,
 
 static void tracking_segment_start_cb(void *userdata,
                                       MovieTrackingTrack *track,
-                                      int coord,
+                                      eClipCurveValueSource value_source,
                                       bool is_point)
 {
   TrackMotionCurveUserData *data = (TrackMotionCurveUserData *)userdata;
+  SpaceClip *sc = data->sc;
   float col[4] = {0.0f, 0.0f, 0.0f, 0.0f};
 
-  col[coord] = 1.0f;
+  if (!clip_graph_value_visible(sc, value_source)) {
+    return;
+  }
+
+  switch (value_source) {
+    case CLIP_VALUE_SOURCE_SPEED_X:
+      col[0] = 1.0f;
+      break;
+    case CLIP_VALUE_SOURCE_SPEED_Y:
+      col[1] = 1.0f;
+      break;
+    case CLIP_VALUE_SOURCE_REPROJECTION_ERROR:
+      col[2] = 1.0f;
+      break;
+  }
 
   if (track == data->act_track) {
     col[3] = 1.0f;
@@ -100,15 +116,20 @@ static void tracking_segment_start_cb(void *userdata,
   }
 }
 
-static void tracking_segment_end_cb(void *UNUSED(userdata), int UNUSED(coord))
+static void tracking_segment_end_cb(void *userdata, eClipCurveValueSource value_source)
 {
+  TrackMotionCurveUserData *data = (TrackMotionCurveUserData *)userdata;
+  SpaceClip *sc = data->sc;
+  if (!clip_graph_value_visible(sc, value_source)) {
+    return;
+  }
   immEnd();
 }
 
 static void tracking_segment_knot_cb(void *userdata,
                                      MovieTrackingTrack *track,
                                      MovieTrackingMarker *marker,
-                                     int coord,
+                                     eClipCurveValueSource value_source,
                                      int scene_framenr,
                                      float val)
 {
@@ -118,8 +139,11 @@ static void tracking_segment_knot_cb(void *userdata,
   if (track != data->act_track) {
     return;
   }
+  if (!ELEM(value_source, CLIP_VALUE_SOURCE_SPEED_X, CLIP_VALUE_SOURCE_SPEED_Y)) {
+    return;
+  }
 
-  sel_flag = coord == 0 ? MARKER_GRAPH_SEL_X : MARKER_GRAPH_SEL_Y;
+  sel_flag = value_source == CLIP_VALUE_SOURCE_SPEED_X ? MARKER_GRAPH_SEL_X : MARKER_GRAPH_SEL_Y;
   sel = (marker->flag & sel_flag) ? 1 : 0;
 
   if (sel == data->sel) {
@@ -135,34 +159,39 @@ static void tracking_segment_knot_cb(void *userdata,
   }
 }
 
-static void draw_tracks_motion_curves(View2D *v2d, SpaceClip *sc, unsigned int pos)
+static void draw_tracks_motion_and_error_curves(View2D *v2d, SpaceClip *sc, unsigned int pos)
 {
   MovieClip *clip = ED_space_clip_get_clip(sc);
   MovieTracking *tracking = &clip->tracking;
   MovieTrackingTrack *act_track = BKE_tracking_track_get_active(tracking);
-  int width, height;
-  TrackMotionCurveUserData userdata;
+  const bool draw_knots = (sc->flag & SC_SHOW_GRAPH_TRACKS_MOTION) != 0;
 
+  int width, height;
   BKE_movieclip_get_size(clip, &sc->user, &width, &height);
-
   if (!width || !height) {
     return;
   }
 
-  /* non-selected knot handles */
+  TrackMotionCurveUserData userdata;
+  userdata.sc = sc;
   userdata.hsize = UI_GetThemeValuef(TH_HANDLE_VERTEX_SIZE);
   userdata.sel = false;
   userdata.act_track = act_track;
   userdata.pos = pos;
-  UI_view2d_scale_get(v2d, &userdata.xscale, &userdata.yscale);
-  clip_graph_tracking_values_iterate(sc,
-                                     (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
-                                     (sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
-                                     &userdata,
-                                     tracking_segment_knot_cb,
-                                     NULL,
-                                     NULL);
-  /* draw graph lines */
+
+  /* Non-selected knot handles. */
+  if (draw_knots) {
+    UI_view2d_scale_get(v2d, &userdata.xscale, &userdata.yscale);
+    clip_graph_tracking_values_iterate(sc,
+                                       (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
+                                       (sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
+                                       &userdata,
+                                       tracking_segment_knot_cb,
+                                       NULL,
+                                       NULL);
+  }
+
+  /* Draw graph lines. */
   GPU_blend(true);
   clip_graph_tracking_values_iterate(sc,
                                      (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
@@ -173,138 +202,19 @@ static void draw_tracks_motion_curves(View2D *v2d, SpaceClip *sc, unsigned int p
                                      tracking_segment_end_cb);
   GPU_blend(false);
 
-  /* selected knot handles on top of curves */
-  userdata.sel = true;
-  clip_graph_tracking_values_iterate(sc,
-                                     (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
-                                     (sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
-                                     &userdata,
-                                     tracking_segment_knot_cb,
-                                     NULL,
-                                     NULL);
-}
-
-typedef struct TrackErrorCurveUserData {
-  MovieClip *clip;
-  MovieTracking *tracking;
-  MovieTrackingObject *tracking_object;
-  MovieTrackingTrack *active_track;
-  bool matrix_initialized;
-  int matrix_frame;
-  float projection_matrix[4][4];
-  int width, height;
-  float aspy;
-  unsigned int pos;
-} TrackErrorCurveUserData;
-
-static void tracking_error_segment_point_cb(void *userdata,
-                                            MovieTrackingTrack *track,
-                                            MovieTrackingMarker *marker,
-                                            int coord,
-                                            int scene_framenr,
-                                            float UNUSED(value))
-{
-  if (coord == 1) {
-    TrackErrorCurveUserData *data = (TrackErrorCurveUserData *)userdata;
-    float reprojected_position[4], bundle_position[4], marker_position[2], delta[2];
-    float reprojection_error;
-    float weight = BKE_tracking_track_get_weight_for_marker(data->clip, track, marker);
-
-    if (!data->matrix_initialized || data->matrix_frame != scene_framenr) {
-      BKE_tracking_get_projection_matrix(data->tracking,
-                                         data->tracking_object,
-                                         scene_framenr,
-                                         data->width,
-                                         data->height,
-                                         data->projection_matrix);
-    }
-
-    copy_v3_v3(bundle_position, track->bundle_pos);
-    bundle_position[3] = 1;
-
-    mul_v4_m4v4(reprojected_position, data->projection_matrix, bundle_position);
-    reprojected_position[0] = (reprojected_position[0] / (reprojected_position[3] * 2.0f) + 0.5f) *
-                              data->width;
-    reprojected_position[1] = (reprojected_position[1] / (reprojected_position[3] * 2.0f) + 0.5f) *
-                              data->height * data->aspy;
-
-    BKE_tracking_distort_v2(data->tracking, reprojected_position, reprojected_position);
-
-    marker_position[0] = (marker->pos[0] + track->offset[0]) * data->width;
-    marker_position[1] = (marker->pos[1] + track->offset[1]) * data->height * data->aspy;
-
-    sub_v2_v2v2(delta, reprojected_position, marker_position);
-    reprojection_error = len_v2(delta) * weight;
-
-    immVertex2f(data->pos, scene_framenr, reprojection_error);
+  /* Selected knot handles on top of curves. */
+  if (draw_knots) {
+    userdata.sel = true;
+    clip_graph_tracking_values_iterate(sc,
+                                       (sc->flag & SC_SHOW_GRAPH_SEL_ONLY) != 0,
+                                       (sc->flag & SC_SHOW_GRAPH_HIDDEN) != 0,
+                                       &userdata,
+                                       tracking_segment_knot_cb,
+                                       NULL,
+                                       NULL);
   }
 }
 
-static void tracking_error_segment_start_cb(void *userdat

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list