Commit: ece7b7dc5318b61c20e78a8b19b6e64ab7f7c09b
Author: Julian Eisel
Date: Tue Nov 29 13:12:29 2016 +0100
Branches: transform-manipulators
https://developer.blender.org/rBece7b7dc5318b61c20e78a8b19b6e64ab7f7c09b
Merge branch 'blender2.8' into transform-manipulators
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
source/blender/editors/screen/glutil.c
source/blender/gpu/intern/gpu_shader.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index 06f8325,3fa3f03..dd4027b
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1360,35 -1395,5 +1395,22 @@@ void blo_do_versions_270(FileData *fd,
}
}
}
+ }
+
- if (!DNA_struct_elem_find(fd->filesdna, "RigidBodyCon",
"float", "spring_stiffness_ang_x")) {
- Object *ob;
- for (ob = main->object.first; ob; ob = ob->id.next) {
- RigidBodyCon *rbc = ob->rigidbody_constraint;
- if (rbc) {
- rbc->spring_stiffness_ang_x = 10.0;
- rbc->spring_stiffness_ang_y = 10.0;
- rbc->spring_stiffness_ang_z = 10.0;
- rbc->spring_damping_ang_x = 0.5;
- rbc->spring_damping_ang_y = 0.5;
- rbc->spring_damping_ang_z = 0.5;
- }
- }
- }
-
++ {
+ /* New transform manipulators */
+ if (!DNA_struct_elem_find(fd->filesdna, "View3D", "char",
"transform_manipulators_type")) {
+ for (bScreen *screen = main->screen.first; screen;
screen = screen->id.next) {
+ for (ScrArea *sa = screen->areabase.first; sa;
sa = sa->next) {
+ /* handle pushed-back space data first
*/
+ for (SpaceLink *sl =
sa->spacedata.first; sl; sl = sl->next) {
+ if (sl->spacetype ==
SPACE_VIEW3D) {
+ View3D *v3d = (View3D
*)sl;
+ v3d->flag3 |=
V3D_USE_TRANSFORM_MANIPULATORS;
+ }
+ }
+ }
+ }
+ }
+ }
}
diff --cc source/blender/editors/interface/resources.c
index 0668bb6,73a9ea9..da72c27
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@@ -2796,17 -2813,7 +2796,13 @@@ void init_userdef_do_versions(void
* (keep this block even if it becomes empty).
*/
{
-
+ for (bTheme *btheme = U.themes.first; btheme; btheme =
btheme->next) {
- /* Keyframe Indicators (were using wrong alpha) */
- btheme->tv3d.time_keyframe[3] =
btheme->tv3d.time_gp_keyframe[3] = 255;
- btheme->ttime.time_keyframe[3] =
btheme->ttime.time_gp_keyframe[3] = 255;
-
+ rgba_char_args_set_fl(btheme->tui.xaxis, 1.0f, 0.27f,
0.27f, 1.0f); /* red */
+ rgba_char_args_set_fl(btheme->tui.yaxis, 0.27f, 1.0f,
0.27f, 1.0f); /* green */
+ rgba_char_args_set_fl(btheme->tui.zaxis, 0.27f, 0.27f,
1.0f, 1.0f); /* blue */
+ }
+ /* Flag value has changed */
+ U.tw_flag = V3D_USE_TRANSFORM_MANIPULATORS;
}
if (U.pixelsize == 0.0f)
diff --cc source/blender/editors/screen/glutil.c
index 0c7839c,4759325..552aa28
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@@ -200,12 -189,12 +189,12 @@@ void imm_draw_lined_circle(unsigned pos
void imm_draw_filled_circle(unsigned pos, float x, float y, float rad, int
nsegments)
{
- imm_draw_circle(GL_TRIANGLE_FAN, pos, x, y, rad, nsegments);
+ imm_draw_circle(PRIM_TRIANGLE_FAN, pos, x, y, rad, nsegments);
}
-void imm_draw_lined_circle_3D(unsigned pos, float x, float y, float rad, int
nsegments)
+static void imm_draw_circle_3D(GLenum prim_type, unsigned pos, float x, float
y, float rad, int nsegments)
{
- immBegin(PRIM_LINE_LOOP, nsegments);
+ immBegin(prim_type, nsegments);
for (int i = 0; i < nsegments; ++i) {
float angle = 2 * M_PI * ((float)i / (float)nsegments);
immVertex3f(pos, x + rad * cosf(angle),
@@@ -214,38 -203,9 +203,38 @@@
immEnd();
}
+void imm_draw_lined_circle_3D(unsigned pos, float x, float y, float rad, int
nsegments)
+{
- imm_draw_circle_3D(GL_LINE_LOOP, pos, x, y, rad, nsegments);
++ imm_draw_circle_3D(PRIM_LINE_LOOP, pos, x, y, rad, nsegments);
+}
+
+void imm_draw_filled_circle_3D(unsigned pos, float x, float y, float rad, int
nsegments)
+{
- imm_draw_circle_3D(GL_TRIANGLE_FAN, pos, x, y, rad, nsegments);
++ imm_draw_circle_3D(PRIM_TRIANGLE_FAN, pos, x, y, rad, nsegments);
+}
+
+static void imm_draw_arc_3D(GLenum prim_type, unsigned int pos, float start,
float angle, float radius, int nsegments)
+{
+ immBegin(prim_type, nsegments + 1);
+
+ immVertex3f(pos, 0.0f, 0.0f, 0.0f);
+ for (int i = 0; i < nsegments; i++) {
+ float t = (float) i / (nsegments - 1);
+ float cur = start + t * angle;
+
+ immVertex3f(pos, cosf(cur) * radius, sinf(cur) * radius, 0.0f);
+ }
+ immEnd();
+}
+
+void imm_draw_filled_arc_3D(unsigned int pos, float start, float angle, float
radius, int nsegments)
+{
- imm_draw_arc_3D(GL_TRIANGLE_FAN, pos, start, angle, radius, nsegments);
++ imm_draw_arc_3D(PRIM_TRIANGLE_FAN, pos, start, angle, radius,
nsegments);
+}
+
void imm_draw_line_box(unsigned pos, float x1, float y1, float x2, float y2)
{
- immBegin(GL_LINE_LOOP, 4);
+ immBegin(PRIM_LINE_LOOP, 4);
immVertex2f(pos, x1, y1);
immVertex2f(pos, x1, y2);
immVertex2f(pos, x2, y2);
diff --cc source/blender/gpu/intern/gpu_shader.c
index 8c4562d,5f41cda..eb1c4f0
--- a/source/blender/gpu/intern/gpu_shader.c
+++ b/source/blender/gpu/intern/gpu_shader.c
@@@ -634,287 -602,102 +603,104 @@@ int GPU_shader_get_attribute(GPUShader
GPUShader *GPU_shader_get_builtin_shader(GPUBuiltinShader shader)
{
- GPUShader *retval = NULL;
-
- switch (shader) {
- case GPU_SHADER_VSM_STORE:
- if (!GG.shaders.vsm_store)
- GG.shaders.vsm_store = GPU_shader_create(
- datatoc_gpu_shader_vsm_store_vert_glsl,
datatoc_gpu_shader_vsm_store_frag_glsl,
- NULL, NULL, NULL, 0, 0, 0);
- retval = GG.shaders.vsm_store;
- break;
- case GPU_SHADER_SEP_GAUSSIAN_BLUR:
- if (!GG.shaders.sep_gaussian_blur)
- GG.shaders.sep_gaussian_blur =
GPU_shader_create(
-
datatoc_gpu_shader_sep_gaussian_blur_vert_glsl,
-
datatoc_gpu_shader_sep_gaussian_blur_frag_glsl,
- NULL, NULL, NULL, 0, 0, 0);
- retval = GG.shaders.sep_gaussian_blur;
- break;
- case GPU_SHADER_SMOKE:
- if (!GG.shaders.smoke)
- GG.shaders.smoke = GPU_shader_create(
- datatoc_gpu_shader_smoke_vert_glsl,
datatoc_gpu_shader_smoke_frag_glsl,
- NULL, NULL, NULL, 0, 0, 0);
- retval = GG.shaders.smoke;
- break;
- case GPU_SHADER_SMOKE_FIRE:
- if (!GG.shaders.smoke_fire)
- GG.shaders.smoke_fire = GPU_shader_create(
- datatoc_gpu_shader_smoke_vert_glsl,
datatoc_gpu_shader_smoke_frag_glsl,
- NULL, NULL, NULL, 0, 0, 0);
- retval = GG.shaders.smoke_fire;
- break;
- case GPU_SHADER_SMOKE_COBA:
- if (!GG.shaders.smoke_coba)
- GG.shaders.smoke_coba = GPU_shader_create(
- datatoc_gpu_shader_smoke_vert_glsl,
datatoc_gpu_shader_smoke_frag_glsl,
- NULL, NULL, "#define USE_COBA;\n", 0,
0, 0);
- retval = GG.shaders.smoke_coba;
- break;
- case GPU_SHADER_TEXT:
- if (!GG.shaders.text)
- GG.shaders.text = GPU_shader_create(
- datatoc_gpu_shader_text_vert_glsl,
- datatoc_gpu_shader_text_frag_glsl,
- NULL, NULL, NULL, 0, 0, 0);
- retval = GG.shaders.text;
- break;
- case GPU_SHADER_EDGES_FRONT_BACK_PERSP:
- if (!GG.shaders.edges_front_back_persp)
- if (GLEW_VERSION_3_2) {
- /* this version is magical but slooow */
- GG.shaders.edges_front_back_persp =
GPU_shader_create(
-
datatoc_gpu_shader_edges_front_back_persp_vert_glsl,
-
datatoc_gpu_shader_flat_color_frag_glsl,
-
datatoc_gpu_shader_edges_front_back_persp_geom_glsl,
- NULL, NULL, 0, 0, 0);
- }
- else {
- GG.shaders.edges_front_back_persp =
GPU_shader_create(
-
datatoc_gpu_shader_edges_front_back_persp_legacy_vert_glsl,
-
datatoc_gpu_shader_flat_color_alpha_test_0_frag_glsl,
- NULL, NULL, NULL, 0, 0, 0);
- }
- retval = GG.shaders.edges_front_back_persp;
- break;
- case GPU_SHADER_EDGES_FRONT_BACK_ORTHO:
- if (!GG.shaders.edges_front_back_ortho)
- GG.shaders.edges_front_back_ortho =
GPU_shader_create(
-
datatoc_gpu_shader_edges_front_back_ortho_vert_glsl,
- datatoc_gpu_shader_flat_color_frag_glsl,
- NULL, NULL, NULL, 0, 0, 0);
- retval = GG.shaders.edges_front_back_ortho;
- break;
- case GPU_SHADER_EDGES_OVERLAY_SIMPLE:
- if (!GG.shaders.edges_overlay_simple)
- GG.shaders.edges_overlay_simple =
GPU_shader_create(
- datatoc_gpu_shader_3D_vert_glsl,
-
datatoc_gpu_shader_edges_overlay_frag_glsl,
-
datatoc_gpu_shader_edges_overlay_simple_geom_glsl,
- NULL, NULL, 0, 0, 0);
- retval = GG.shaders.edges_overlay_simple;
- break;
- case GPU_SHADER_EDGES_OVERLAY:
- if (!GG.shaders.edges_overlay)
- GG.shaders.edges_overlay = GPU_shader_create(
-
datatoc_gpu_shader_edges_overlay_vert_glsl,
-
datatoc_gpu_shader_edges_overlay_frag_glsl,
-
datatoc_gpu_shader_edges_overlay_geom_glsl,
- NULL, NULL, 0, 0, 0);
- retval = GG.shaders.edges_overlay;
- break;
- case GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR:
- if (!GG.shaders.image_mask_uniform_color_2D)
- GG.shaders.image_mask_uniform_color_2D =
GPU_shader_create(
- datatoc_gpu_shader_3D_image_vert_glsl,
-
datatoc_gpu_shader_image_mask_uniform_color_frag_glsl,
- NULL, NULL, NULL, 0, 0, 0);
- retval = GG.shaders.image_mask_uniform_color_2D;
- break;
- case GPU_SHADER_3D_IMAGE_MODULATE_ALPHA:
- if (!GG.shaders.image_modulate_alpha_3D)
- GG.shaders.image_modulate_alpha_3D =
GPU_shader_create(
- datatoc_gpu_shader_3D_image_vert_glsl,
-
datatoc_gpu_shader_image_modulate_alpha_frag_glsl,
- NULL, NULL, NULL, 0, 0, 0);
- retval = GG.shaders.image_modulate_alpha_3D;
- break;
- case GPU_SHADER_3D_IMAGE_RECT_MODULATE_ALPHA:
- if (!GG.shaders.image_rect_modulate_alpha_3D)
- GG.shaders.image_rect_modulate_alpha_3D =
GPU_shader_create(
- datatoc_gpu_shader_3D_image_vert_glsl,
-
datatoc_gpu_shader_image_rect_modulate_alpha_frag_glsl,
- NULL, NULL, NULL, 0, 0, 0);
- retval = GG.shaders.image_rect_modulate_alpha_3D;
- break;
- case GPU_SHADER_3D_IMAGE_DEPTH:
- if (!GG.shaders.image_depth_3D)
- GG.shaders.image_depth_3D = GPU_shader_create(
- datatoc_gpu_shader_3D_image_vert_glsl,
- datatoc_gpu_shade
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
