[Bf-blender-cvs] [97dff0ca764] master: Clip Editor: Fix uninitialized plane track grabbing points

Sergey Sharybin noreply at git.blender.org
Tue Nov 26 15:56:40 CET 2019


Commit: 97dff0ca764042c97feceb5d33a4766098090d2e
Author: Sergey Sharybin
Date:   Tue Nov 26 15:53:32 2019 +0100
Branches: master
https://developer.blender.org/rB97dff0ca764042c97feceb5d33a4766098090d2e

Clip Editor: Fix uninitialized plane track grabbing points

Was happening when there was an image assigned to the track.

Another pair programming session with Clement.

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

M	source/blender/editors/space_clip/clip_draw.c

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

diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 63bf47412e8..74cf28ce5d4 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -1322,6 +1322,10 @@ static void draw_plane_marker_ex(SpaceClip *sc,
 
     immUniform1i("colors_len", 0); /* "simple" mode */
 
+    if (is_selected_track) {
+      plane_track_colors(is_active_track, color, selected_color);
+    }
+
     if (draw_plane_quad) {
       const bool stipple = !draw_outline && tiny;
       const bool thick = draw_outline && !tiny;
@@ -1340,7 +1344,6 @@ static void draw_plane_marker_ex(SpaceClip *sc,
         immUniformThemeColor(TH_MARKER_OUTLINE);
       }
       else {
-        plane_track_colors(is_active_track, color, selected_color);
         immUniformColor3fv(is_selected_track ? selected_color : color);
       }



More information about the Bf-blender-cvs mailing list