Commit: 395f6bcc605c6a97d847386f065a072d39b8183b
Author: Lukas Stockner
Date: Sun Jul 15 22:57:56 2018 +0200
Branches: temp-udim-images
https://developer.blender.org/rB395f6bcc605c6a97d847386f065a072d39b8183b
Merge remote-tracking branch 'origin/blender2.8' into udim
===================================================================
===================================================================
diff --cc intern/cycles/blender/blender_shader.cpp
index 0bcbcbb4991,6129565fec5..b8465fce263
--- a/intern/cycles/blender/blender_shader.cpp
+++ b/intern/cycles/blender/blender_shader.cpp
@@@ -1441,14 -1411,14 +1418,14 @@@ void BlenderSync::sync_lights(BL::Depsg
Shader *shader;
/* test if we need to sync */
- if(shader_map.sync(&shader, b_lamp) || update_all) {
+ if(shader_map.sync(&shader, b_light) || update_all) {
- ShaderGraph *graph = new ShaderGraph();
+ ShaderGraph *graph = new ShaderGraph(shader);
/* create nodes */
- if(b_lamp.use_nodes() && b_lamp.node_tree()) {
- shader->name = b_lamp.name().c_str();
+ if(b_light.use_nodes() && b_light.node_tree()) {
+ shader->name = b_light.name().c_str();
- BL::ShaderNodeTree b_ntree(b_lamp.node_tree());
+ BL::ShaderNodeTree b_ntree(b_light.node_tree());
add_nodes(scene, b_engine, b_data, b_depsgraph,
b_scene, graph, b_ntree);
}
diff --cc source/blender/blenkernel/intern/image.c
index 1fb7d46bacb,aedbd0673c2..870949018bc
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@@ -3335,7 -3059,7 +3265,7 @@@ static void image_create_multilayer(Ima
#endif /* WITH_OPENEXR */
/* common stuff to do with images after loading */
- static void image_initialize_after_load(Image *ima, ImageUser *iuser, ImBuf
*ibuf)
-static void image_initialize_after_load(Image *ima, ImBuf *UNUSED(ibuf))
++static void image_initialize_after_load(Image *ima, ImageUser *iuser, ImBuf
*UNUSED(ibuf))
{
/* Preview is NULL when it has never been used as an icon before.
* Never handle previews/icons outside of main thread. */
diff --cc source/blender/editors/screen/area.c
index f8b6cbd889f,cb8fdba0ae1..89a856052d3
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@@ -2732,21 -2732,21 +2732,21 @@@ void ED_region_image_metadata_draw(int
BLF_disable(blf_mono_font, BLF_CLIPPING);
}
- gpuPopMatrix();
+ GPU_matrix_pop();
}
-void ED_region_grid_draw(ARegion *ar, float zoomx, float zoomy)
+void ED_region_grid_draw(ARegion *ar, float zoomx, float zoomy, float x0,
float y0)
{
float gridsize, gridstep = 1.0f / 32.0f;
float fac, blendfac;
int x1, y1, x2, y2;
- /* the image is located inside (0, 0), (1, 1) as set by view2d */
- UI_view2d_view_to_region(&ar->v2d, 0.0f, 0.0f, &x1, &y1);
- UI_view2d_view_to_region(&ar->v2d, 1.0f, 1.0f, &x2, &y2);
+ /* the image is located inside (x0, y0), (x0+1, y0+1) as set by view2d
*/
+ UI_view2d_view_to_region(&ar->v2d, x0, y0, &x1, &y1);
+ UI_view2d_view_to_region(&ar->v2d, x0+1.0f, y0+1.0f, &x2, &y2);
Gwn_VertFormat *format = immVertexFormat();
- unsigned int pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32,
2, GWN_FETCH_FLOAT);
+ uint pos = GWN_vertformat_attr_add(format, "pos", GWN_COMP_F32, 2,
GWN_FETCH_FLOAT);
immBindBuiltinProgram(GPU_SHADER_2D_UNIFORM_COLOR);
immUniformThemeColorShade(TH_BACK, 20);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
