Commit: 077ac7b3025d40fd9f787188b0bd2c9c21035a68
Author: Julian Eisel
Date: Tue Nov 8 20:42:52 2016 +0100
Branches: transform-manipulators
https://developer.blender.org/rB077ac7b3025d40fd9f787188b0bd2c9c21035a68
Merge branch 'blender2.8' into transform-manipulators
Conflicts:
source/blender/gpu/intern/gpu_shader.c
===================================================================
===================================================================
diff --cc source/blender/editors/space_view3d/view3d_draw.c
index ef56700,e843d3c..a975a75
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@@ -1680,9 -1792,12 +1796,12 @@@ static void view3d_draw_view(const bCon
view3d_draw_other_elements(C, ar);
view3d_draw_tool_ui(C);
view3d_draw_reference_images(C);
- view3d_draw_manipulator(C);
+ view3d_draw_manipulators(C, ar);
view3d_draw_region_info(C, ar);
+
+ #if VIEW3D_DRAW_DEBUG
view3d_draw_debug(C, ar, draw_data);
+ #endif
}
void view3d_main_region_draw(const bContext *C, ARegion *ar)
diff --cc source/blender/editors/space_view3d/view3d_intern.h
index 8c35aed,a5d8ebb..c23a744
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@@ -342,9 -336,7 +336,11 @@@ void draw_dupli_objects(Scene *scene, A
bool VP_legacy_use_depth(Scene *scene, View3D *v3d);
void VP_drawviewborder(Scene *scene, ARegion *ar, View3D *v3d);
void VP_drawrenderborder(ARegion *ar, View3D *v3d);
+ void VP_view3d_draw_background_none(void);
+ void VP_view3d_draw_background_world(Scene *scene, View3D *v3d, RegionView3D
*rv3d);
+/* manipulators */
+
+void VIEW3D_MGT_transform_manipulators(struct wmManipulatorGroupType *mgt);
+
#endif /* __VIEW3D_INTERN_H__ */
diff --cc source/blender/gpu/GPU_shader.h
index 0697c05,cf7e00d..be46425
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@@ -101,8 -106,8 +106,9 @@@ typedef enum GPUBuiltinShader
GPU_SHADER_3D_FLAT_COLOR,
GPU_SHADER_3D_SMOOTH_COLOR,
GPU_SHADER_3D_DEPTH_ONLY,
+ GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR,
/* basic image drawing */
+ GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR,
GPU_SHADER_3D_IMAGE_MODULATE_ALPHA,
GPU_SHADER_3D_IMAGE_RECT_MODULATE_ALPHA,
GPU_SHADER_3D_IMAGE_DEPTH,
diff --cc source/blender/gpu/intern/gpu_shader.c
index c51821b,4f6206b..8c4562d
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@@ -992,11 -1088,11 +1098,16 @@@ void GPU_shader_free_builtin_shaders(vo
GG.shaders.smooth_color_3D = NULL;
}
+ if (GG.shaders.depth_only_3D) {
+ GPU_shader_free(GG.shaders.depth_only_3D);
+ GG.shaders.depth_only_3D = NULL;
+ }
+
+ if (GG.shaders.clipped_uniform_color_3D) {
+ GPU_shader_free(GG.shaders.clipped_uniform_color_3D);
+ GG.shaders.clipped_uniform_color_3D = NULL;
+ }
+
if (GG.shaders.point_fixed_size_uniform_color_2D) {
GPU_shader_free(GG.shaders.point_fixed_size_uniform_color_2D);
GG.shaders.point_fixed_size_uniform_color_2D = NULL;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
