Commit: 6491dcf167e690b58d2c873c31cfcb72dd9f5128 Author: Yiming Wu Date: Sat Apr 20 14:13:23 2019 +0800 Branches: soc-2018-npr https://developer.blender.org/rB6491dcf167e690b58d2c873c31cfcb72dd9f5128
Merge remote-tracking branch 'origin/soc-2018-npr' into soc-2018-npr # Conflicts: # intern/opensubdiv/internal/opensubdiv_evaluator.cc # intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc # release/scripts/startup/bl_ui/properties_data_modifier.py # source/blender/CMakeLists.txt # source/blender/blenkernel/intern/scene.c # source/blender/blenloader/intern/readfile.c # source/blender/blenloader/intern/versioning_280.c # source/blender/blenloader/intern/writefile.c # source/blender/bmesh/intern/bmesh_polygon.c # source/blender/draw/CMakeLists.txt # source/blender/draw/intern/draw_manager.c # source/blender/draw/modes/object_mode.c # source/blender/editors/mesh/editmesh_tools.c # source/blender/editors/mesh/mesh_ops.c # source/blender/editors/render/render_intern.h # source/blender/editors/render/render_ops.c # source/blender/editors/space_outliner/outliner_draw.c # source/blender/editors/space_view3d/space_view3d.c # source/blender/makesdna/DNA_light_types.h # source/blender/makesdna/DNA_modifier_types.h # source/blender/makesdna/DNA_scene_types.h # source/blender/makesdna/intern/makesdna.c # source/blender/makesrna/intern/CMakeLists.txt # source/blender/makesrna/intern/makesrna.c # source/blender/makesrna/intern/rna_modifier.c # source/blender/makesrna/intern/rna_scene.c # source/blender/modifiers/CMakeLists.txt # source/blender/modifiers/intern/MOD_util.c =================================================================== =================================================================== diff --cc intern/opensubdiv/internal/opensubdiv_evaluator.cc index 0fe9c7567ea,a8253a144e2..02ec9caa0a0 --- a/intern/opensubdiv/internal/opensubdiv_evaluator.cc +++ b/intern/opensubdiv/internal/opensubdiv_evaluator.cc @@@ -99,15 -91,18 +99,19 @@@ void refine(OpenSubdiv_Evaluator* evalu evaluator->internal->eval_output->refine(); } -void evaluateLimit(OpenSubdiv_Evaluator *evaluator, +void evaluateLimit(OpenSubdiv_Evaluator* evaluator, const int ptex_face_index, - const float face_u, - const float face_v, - float P[3], - float dPdu[3], - float dPdv[3]) -{ - evaluator->internal->eval_output->evaluateLimit(ptex_face_index, face_u, face_v, P, dPdu, dPdv); + const float face_u, const float face_v, + float P[3], float dPdu[3], float dPdv[3]) { + evaluator->internal->eval_output->evaluateLimit(ptex_face_index, + face_u, face_v, + P, dPdu, dPdv); } + <<<<<<< HEAD ++======= ++<<<<<<< HEAD ++>>>>>>> origin/soc-2018-npr void evaluateLimit2(OpenSubdiv_Evaluator* evaluator, const int ptex_face_index, const float face_u, const float face_v, @@@ -124,19 -119,24 +128,25 @@@ } void evaluateVarying(OpenSubdiv_Evaluator* evaluator, ++<<<<<<< HEAD ++======= + ======= + void evaluateVarying(OpenSubdiv_Evaluator *evaluator, + >>>>>>> master ++>>>>>>> origin/soc-2018-npr const int ptex_face_index, - float face_u, - float face_v, - float varying[3]) -{ - evaluator->internal->eval_output->evaluateVarying(ptex_face_index, face_u, face_v, varying); + float face_u, float face_v, + float varying[3]) { + evaluator->internal->eval_output->evaluateVarying(ptex_face_index, + face_u, face_v, + varying); } -void evaluateFaceVarying(OpenSubdiv_Evaluator *evaluator, +void evaluateFaceVarying(OpenSubdiv_Evaluator* evaluator, const int face_varying_channel, const int ptex_face_index, - float face_u, - float face_v, - float face_varying[2]) -{ + float face_u, float face_v, + float face_varying[2]) { evaluator->internal->eval_output->evaluateFaceVarying( face_varying_channel, ptex_face_index, face_u, face_v, face_varying); } diff --cc intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc index 810ec4a8f91,ccc0ec846f7..6ef1119aaee --- a/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc +++ b/intern/opensubdiv/internal/opensubdiv_evaluator_internal.cc @@@ -458,6 -461,7 +458,10 @@@ class VolatileEvalOutput } } + <<<<<<< HEAD ++======= ++<<<<<<< HEAD ++>>>>>>> origin/soc-2018-npr void evalPatchesWithDerivatives2(const PatchCoord& patch_coord, float P[3], float dPdu[3], @@@ -522,6 -526,10 +526,13 @@@ } void evalPatchVarying(const PatchCoord& patch_coord, float varying[3]) { ++<<<<<<< HEAD ++======= + ======= + void evalPatchVarying(const PatchCoord &patch_coord, float varying[3]) + { + >>>>>>> master ++>>>>>>> origin/soc-2018-npr StackAllocatedBuffer<6, 1> varying_data; BufferDescriptor varying_desc(3, 3, 6); SinglePatchCoordBuffer patch_coord_buffer(patch_coord); diff --cc release/scripts/startup/bl_ui/properties_data_modifier.py index b490434bdb7,3c2bcd44c9e..0db2b60c569 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@@ -673,6 -673,7 +673,10 @@@ class DATA_PT_modifiers(ModifierButtons row.operator("object.multires_external_save", text="Save External...") row.label() + <<<<<<< HEAD ++======= ++<<<<<<< HEAD ++>>>>>>> origin/soc-2018-npr def MY_BMESH(self, layout, ob, md): split = layout.split(factor=0.25) @@@ -699,6 -700,9 +703,12 @@@ col.prop(md, "camera_object", text="") def OCEAN(self, layout, ob, md): ++<<<<<<< HEAD ++======= + ======= + def OCEAN(self, layout, _ob, md): + >>>>>>> master ++>>>>>>> origin/soc-2018-npr if not bpy.app.build_options.mod_oceansim: layout.label(text="Built without OceanSim modifier") return diff --cc source/blender/CMakeLists.txt index 76442048594,b7719f7b3b3..36448d104d8 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@@ -19,6 -19,79 +19,82 @@@ # ***** END GPL LICENSE BLOCK ***** set(SRC_DNA_INC ++<<<<<<< HEAD ++======= + <<<<<<< HEAD + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_ID.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_action_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_anim_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_armature_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_boid_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_brush_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_cachefile_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_camera_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_cloth_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_collection_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_color_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_constraint_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_curve_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_customdata_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_defs.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_documentation.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_dynamicpaint_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_effect_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_fileglobal_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_freestyle_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_genfile.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_gpencil_modifier_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_gpencil_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_gpu_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_image_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_ipo_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_key_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_layer_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_light_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lightprobe_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mask_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_meshdata_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_meta_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_modifier_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_movieclip_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_nla_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_node_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_enums.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_fluidsim_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_force_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_object_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_outliner_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_packedFile_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_particle_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_rigidbody_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_scene_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_screen_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_sdna_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_sequence_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_shader_fx_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_smoke_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_sound_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_space_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_speaker_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_text_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_texture_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_tracking_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_userdef_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_vec_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_vfont_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_view2d_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_view3d_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_windowmanager_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_workspace_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_world_types.h + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lanpr_types.h + ======= ++>>>>>>> origin/soc-2018-npr ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_ID.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_action_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_anim_types.h @@@ -89,6 -162,7 +165,10 @@@ ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_windowmanager_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_workspace_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_world_types.h ++<<<<<<< HEAD ++======= + >>>>>>> master ++>>>>>>> origin/soc-2018-npr ) add_subdirectory(datatoc) diff --cc source/blender/blenkernel/intern/scene.c index ee85ce40f2a,df804365899..68e2731aeee --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@@ -550,6 -550,452 +550,455 @@@ void BKE_scene_free(Scene *sce void BKE_scene_init(Scene *sce) { ++<<<<<<< HEAD ++======= + <<<<<<< HEAD + ParticleEditSettings *pset; + int a; + const char *colorspace_name; + SceneRenderView *srv; + CurveMapping *mblur_shutter_curve; + + BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(sce, id)) @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs